summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--plugins/ExternalAPI/m_hotkeysplus.h22
-rw-r--r--plugins/ExternalAPI/m_nconvers.h22
-rw-r--r--plugins/ExternalAPI/m_vsramm.h11
-rw-r--r--plugins/Popup/src/headers.h3
-rw-r--r--plugins/Popup/src/m_hpp.h11
-rw-r--r--plugins/StatusPlugins/StartupStatus/StartupStatus.rc4
-rw-r--r--plugins/StatusPlugins/commonstatus.cpp58
-rw-r--r--plugins/StatusPlugins/commonstatus.h1
-rw-r--r--plugins/StatusPlugins/resource.rc4
-rw-r--r--plugins/StatusPlugins/version.rc2
10 files changed, 40 insertions, 98 deletions
diff --git a/plugins/ExternalAPI/m_hotkeysplus.h b/plugins/ExternalAPI/m_hotkeysplus.h
deleted file mode 100644
index 3da357f109..0000000000
--- a/plugins/ExternalAPI/m_hotkeysplus.h
+++ /dev/null
@@ -1,22 +0,0 @@
-#define MS_HOTKEYSPLUS_ADDKEY "HotkeysPlus/Add"
-
-/*
-This service registers hotkey for
-WPARAM - service to perform
-LPARAM - decription of the service
-Returned values:
- 0 - success,
- 1 - hotkey for this function is already existing,
- 2 - the service, that you try to register the hotkey for, not exists
-*/
-
-#define MS_HOTKEYSPLUS_EXISTKEY "HotkeysPlus/Exist"
-/*
-This service checks whether hotkey for service (WPARAM) exists
-LPARAM - not used
-Returned values:
- 0 - failed,
- 1 - the hotkey for this function exists,
- 2 - the service not exists
-*/
-
diff --git a/plugins/ExternalAPI/m_nconvers.h b/plugins/ExternalAPI/m_nconvers.h
deleted file mode 100644
index 873d2368c4..0000000000
--- a/plugins/ExternalAPI/m_nconvers.h
+++ /dev/null
@@ -1,22 +0,0 @@
-#ifndef __m_nconvers_h__
-#define __m_nconvers_h__
-
-//replace smiley tags in a rich edit control...
-//wParam = (WPARAM) 0; not used
-//lParam = (LPARAM) (NCONVERS_GETICON*) &ncgi;
-//return: TRUE if found, FALSE if not
-
-typedef struct
-{
- int cbSize; // = sizeof(NCONVERS_GETSMILEY)
- char* Protocolname; // NULL means 'default'
- char* SmileySequence; // character string containing the smiley
- HICON SmileyIcon; // RETURN VALUE: this is filled with the icon handle...
- // do not destroy!
- int Smileylength; //l ength of the smiley that is found.
-} NCONVERS_GETICON;
-
-#define MS_NCONVERS_GETSMILEYICON "nConvers/GetSmileyIcon"
-
-
-#endif // __m_nconvers_h__ \ No newline at end of file
diff --git a/plugins/ExternalAPI/m_vsramm.h b/plugins/ExternalAPI/m_vsramm.h
deleted file mode 100644
index cff14d8a2e..0000000000
--- a/plugins/ExternalAPI/m_vsramm.h
+++ /dev/null
@@ -1,11 +0,0 @@
-typedef struct {
- char *szProto;
- char *msg;
- char *uMsg;
- int statusMode;
-} PROTOMSGINFO;
-
-// wParam = 0
-// lParam = PROTOMSGINFO *
-// returns 0 on success
-#define MS_VSRAMM_SETAWAYMSG "VSRAMM/SetAwayMsg" \ No newline at end of file
diff --git a/plugins/Popup/src/headers.h b/plugins/Popup/src/headers.h
index ae36537fc9..e0c8f65d7f 100644
--- a/plugins/Popup/src/headers.h
+++ b/plugins/Popup/src/headers.h
@@ -124,9 +124,7 @@ Last change by : $Author: Merlin_de $
// API for 3rd party plugins (\include_API folder)
// this folder contain always the latest API
#include <m_folders.h>
- #include <m_hpp.h>
#include <m_ieview.h>
- #include <m_nconvers.h>
#include <m_smileyadd.h>
#ifndef MTEXT_NOHELPERS
#define MTEXT_NOHELPERS
@@ -153,6 +151,7 @@ Last change by : $Author: Merlin_de $
#include "opt_skins.h"
#include "opt_contacts.h"
#include "opt_adv.h"
+ #include "m_hpp.h"
#include "history.h"
#include "services.h"
#include "srmm_menu.h"
diff --git a/plugins/Popup/src/m_hpp.h b/plugins/Popup/src/m_hpp.h
new file mode 100644
index 0000000000..169b666209
--- /dev/null
+++ b/plugins/Popup/src/m_hpp.h
@@ -0,0 +1,11 @@
+#ifndef __m_hhp__
+#define __m_hhp__
+
+#define MS_HPP_GETVERSION "History++/GetVersion"
+
+#define MS_HPP_EG_WINDOW "History++/ExtGrid/NewWindow"
+#define MS_HPP_EG_EVENT "History++/ExtGrid/Event"
+#define MS_HPP_EG_NAVIGATE "History++/ExtGrid/Navigate"
+#define MS_HPP_EG_OPTIONSCHANGED "History++/ExtGrid/OptionsChanged"
+
+#endif // __m_hhp__
diff --git a/plugins/StatusPlugins/StartupStatus/StartupStatus.rc b/plugins/StatusPlugins/StartupStatus/StartupStatus.rc
index 8f41f36229..a7a2bebb2a 100644
--- a/plugins/StatusPlugins/StartupStatus/StartupStatus.rc
+++ b/plugins/StatusPlugins/StartupStatus/StartupStatus.rc
@@ -7,7 +7,7 @@
//
// Generated from the TEXTINCLUDE 2 resource.
//
-#include "afxres.h"
+#include "winres.h"
/////////////////////////////////////////////////////////////////////////////
#undef APSTUDIO_READONLY_SYMBOLS
@@ -34,7 +34,7 @@ END
2 TEXTINCLUDE
BEGIN
- "#include ""afxres.h""\r\n"
+ "#include ""winres.h""\r\n"
"\0"
END
diff --git a/plugins/StatusPlugins/commonstatus.cpp b/plugins/StatusPlugins/commonstatus.cpp
index fb9bac079e..d1e214b307 100644
--- a/plugins/StatusPlugins/commonstatus.cpp
+++ b/plugins/StatusPlugins/commonstatus.cpp
@@ -313,43 +313,31 @@ static void SetStatusMsg(PROTOCOLSETTINGEX *ps, int newstatus)
{
TCHAR* tszMsg = GetDefaultStatusMessage( ps, newstatus );
if ( tszMsg ) {
- if ( ServiceExists( MS_VSRAMM_SETAWAYMSG )) {
- PROTOMSGINFO pmi;
-
- pmi.statusMode = ps->status;
- pmi.szProto = ps->szName;
- pmi.msg = mir_t2a( tszMsg );
- log_debugA("CommonStatus sets status message for %s using VSRAMM", ps->szName);
- CallService( MS_VSRAMM_SETAWAYMSG, 0, (LPARAM)&pmi );
- mir_free( pmi.msg );
- }
- else {
/* replace the default vars in msg (I believe this is from core) */
- for ( int j=0; tszMsg[j]; j++ ) {
- TCHAR substituteStr[128];
-
- if ( tszMsg[j] != '%' )
- continue;
-
- if ( !_tcsnicmp( tszMsg+j, _T("%time%"), 6 ))
- GetTimeFormat( LOCALE_USER_DEFAULT, TIME_NOSECONDS, 0, 0, substituteStr, SIZEOF(substituteStr));
- else if ( !_tcsnicmp( tszMsg+j, _T("%date%"), 6 ))
- GetDateFormat( LOCALE_USER_DEFAULT, DATE_SHORTDATE, 0, 0, substituteStr, SIZEOF(substituteStr));
- else
- continue;
-
- if ( lstrlen( substituteStr ) > 6 )
- tszMsg = (TCHAR*)mir_realloc(tszMsg, sizeof(TCHAR)*(lstrlen(tszMsg)+1+lstrlen(substituteStr)-6));
- MoveMemory( tszMsg + j + lstrlen(substituteStr), tszMsg+j+6, sizeof(TCHAR)*(lstrlen(tszMsg)-j-5));
- CopyMemory( tszMsg + j, substituteStr, sizeof(TCHAR)*lstrlen( substituteStr ));
- }
+ for ( int j=0; tszMsg[j]; j++ ) {
+ TCHAR substituteStr[128];
- TCHAR* szFormattedMsg = variables_parsedup(tszMsg, ps->tszAccName, NULL);
- if (szFormattedMsg != NULL) {
- mir_free( tszMsg );
- tszMsg = mir_tstrdup( szFormattedMsg );
- free( szFormattedMsg );
- }
+ if ( tszMsg[j] != '%' )
+ continue;
+
+ if ( !_tcsnicmp( tszMsg+j, _T("%time%"), 6 ))
+ GetTimeFormat( LOCALE_USER_DEFAULT, TIME_NOSECONDS, 0, 0, substituteStr, SIZEOF(substituteStr));
+ else if ( !_tcsnicmp( tszMsg+j, _T("%date%"), 6 ))
+ GetDateFormat( LOCALE_USER_DEFAULT, DATE_SHORTDATE, 0, 0, substituteStr, SIZEOF(substituteStr));
+ else
+ continue;
+
+ if ( lstrlen( substituteStr ) > 6 )
+ tszMsg = (TCHAR*)mir_realloc(tszMsg, sizeof(TCHAR)*(lstrlen(tszMsg)+1+lstrlen(substituteStr)-6));
+ MoveMemory( tszMsg + j + lstrlen(substituteStr), tszMsg+j+6, sizeof(TCHAR)*(lstrlen(tszMsg)-j-5));
+ CopyMemory( tszMsg + j, substituteStr, sizeof(TCHAR)*lstrlen( substituteStr ));
+ }
+
+ TCHAR* szFormattedMsg = variables_parsedup(tszMsg, ps->tszAccName, NULL);
+ if (szFormattedMsg != NULL) {
+ mir_free( tszMsg );
+ tszMsg = mir_tstrdup( szFormattedMsg );
+ free( szFormattedMsg );
}
}
diff --git a/plugins/StatusPlugins/commonstatus.h b/plugins/StatusPlugins/commonstatus.h
index 5c0a531d0c..e0909e94ac 100644
--- a/plugins/StatusPlugins/commonstatus.h
+++ b/plugins/StatusPlugins/commonstatus.h
@@ -44,7 +44,6 @@
#include <m_variables.h>
#include <m_netlib.h>
#include "m_statusplugins.h"
-#include <m_vsramm.h>
#include <m_utils.h>
#include <m_NewAwaySys.h>
#include <m_updater.h>
diff --git a/plugins/StatusPlugins/resource.rc b/plugins/StatusPlugins/resource.rc
index 99658d9ecb..c4fa7935d1 100644
--- a/plugins/StatusPlugins/resource.rc
+++ b/plugins/StatusPlugins/resource.rc
@@ -7,7 +7,7 @@
//
// Generated from the TEXTINCLUDE 2 resource.
//
-#include "afxres.h"
+#include "winres.h"
/////////////////////////////////////////////////////////////////////////////
#undef APSTUDIO_READONLY_SYMBOLS
@@ -34,7 +34,7 @@ END
2 TEXTINCLUDE
BEGIN
- "#include ""afxres.h""\r\n"
+ "#include ""winres.h""\r\n"
"\0"
END
diff --git a/plugins/StatusPlugins/version.rc b/plugins/StatusPlugins/version.rc
index 8f6f25b2da..9ac8419e99 100644
--- a/plugins/StatusPlugins/version.rc
+++ b/plugins/StatusPlugins/version.rc
@@ -1,5 +1,5 @@
#include "version.h"
-#include "afxres.h"
+#include "winres.h"
#ifdef _WIN32
LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-16 01:48:03 +0000