diff options
| -rw-r--r-- | plugins/Clist_ng/INCLUDE/clui.h | 2 | ||||
| -rw-r--r-- | plugins/Clist_ng/INCLUDE/commonheaders.h | 2 | ||||
| -rw-r--r-- | plugins/Clist_ng/SRC/init.cpp | 1 | ||||
| -rw-r--r-- | plugins/Clist_nicer/src/clc.h | 1 | ||||
| -rw-r--r-- | plugins/Clist_nicer/src/init.cpp | 1 | ||||
| -rw-r--r-- | plugins/ExternalAPI/delphi/m_tabsrmm.inc | 8 | ||||
| -rw-r--r-- | plugins/TabSRMM/src/msgs.cpp | 20 | ||||
| -rw-r--r-- | plugins/TabSRMM/src/msgs.h | 6 |
8 files changed, 1 insertions, 40 deletions
diff --git a/plugins/Clist_ng/INCLUDE/clui.h b/plugins/Clist_ng/INCLUDE/clui.h index bd8dee714c..e91ea2bfae 100644 --- a/plugins/Clist_ng/INCLUDE/clui.h +++ b/plugins/Clist_ng/INCLUDE/clui.h @@ -43,7 +43,7 @@ struct TCluiData { DWORD dwFlags;
int soundsOff;
BYTE bMetaAvail;
- BYTE bAvatarServiceAvail, tabSRMM_Avail;
+ BYTE bAvatarServiceAvail;
HICON hIconVisible, hIconInvisible, hIconChatactive, hIconConnecting;
int notifyActive;
int hIconNotify;
diff --git a/plugins/Clist_ng/INCLUDE/commonheaders.h b/plugins/Clist_ng/INCLUDE/commonheaders.h index 6575dbfe92..5e8237ab1d 100644 --- a/plugins/Clist_ng/INCLUDE/commonheaders.h +++ b/plugins/Clist_ng/INCLUDE/commonheaders.h @@ -72,7 +72,6 @@ int _DebugTraceA(const char *fmt, ...); #include <m_addcontact.h>
#include <m_timezones.h>
#include <m_cluiframes.h>
-#include <m_clui.h>
#include <m_icolib.h>
#include <m_fontservice.h>
#include <m_xstatus.h>
@@ -124,7 +123,6 @@ int _DebugTraceA(const char *fmt, ...); #include <m_contacts.h>
#include <m_icolib.h>
#include <m_clc.h>
-#include <m_clui.h>
#include <m_userinfo.h>
#include <m_history.h>
#include <m_addcontact.h>
diff --git a/plugins/Clist_ng/SRC/init.cpp b/plugins/Clist_ng/SRC/init.cpp index eacf362b0d..25fff6a8c9 100644 --- a/plugins/Clist_ng/SRC/init.cpp +++ b/plugins/Clist_ng/SRC/init.cpp @@ -178,7 +178,6 @@ static int systemModulesLoaded(WPARAM wParam, LPARAM lParam) cfg::dat.bAvatarServiceAvail = ServiceExists(MS_AV_GETAVATARBITMAP) ? TRUE : FALSE;
if (cfg::dat.bAvatarServiceAvail)
HookEvent(ME_AV_AVATARCHANGED, AvatarChanged);
- cfg::dat.tabSRMM_Avail = ServiceExists("SRMsg_MOD/GetWindowFlags") ? TRUE : FALSE;
ZeroMemory((void *)overlayicons, sizeof(HICON) * 10);
diff --git a/plugins/Clist_nicer/src/clc.h b/plugins/Clist_nicer/src/clc.h index f5303f506d..7f07c322fb 100644 --- a/plugins/Clist_nicer/src/clc.h +++ b/plugins/Clist_nicer/src/clc.h @@ -221,7 +221,6 @@ struct TCluiData { DWORD topOffset, bottomOffset;
int statusBarHeight;
int soundsOff;
- BYTE tabSRMM_Avail;
BYTE bAvatarServiceAvail;
HICON hIconConnecting;
DWORD winFlags;
diff --git a/plugins/Clist_nicer/src/init.cpp b/plugins/Clist_nicer/src/init.cpp index 28fad9a612..445ec180cd 100644 --- a/plugins/Clist_nicer/src/init.cpp +++ b/plugins/Clist_nicer/src/init.cpp @@ -106,7 +106,6 @@ static int systemModulesLoaded(WPARAM, LPARAM) cfg::dat.bAvatarServiceAvail = ServiceExists(MS_AV_GETAVATARBITMAP) ? TRUE : FALSE;
if (cfg::dat.bAvatarServiceAvail)
HookEvent(ME_AV_AVATARCHANGED, AvatarChanged);
- cfg::dat.tabSRMM_Avail = ServiceExists("SRMsg_MOD/GetWindowFlags") ? TRUE : FALSE;
memset(&overlayicons, 0, sizeof(overlayicons));
diff --git a/plugins/ExternalAPI/delphi/m_tabsrmm.inc b/plugins/ExternalAPI/delphi/m_tabsrmm.inc index cdf42942e2..367808c4ed 100644 --- a/plugins/ExternalAPI/delphi/m_tabsrmm.inc +++ b/plugins/ExternalAPI/delphi/m_tabsrmm.inc @@ -24,12 +24,4 @@ const }
MS_MSG_MOD_MESSAGEDIALOGOPENED:PAnsiChar = 'SRMsg_MOD/MessageDialogOpened';
-{
- obtain the message window flags
- wParam = hContact - ignored if lParam is given.
- lParam = hwnd
- returns struct MessageWindowData *dat, 0 if no window is found
-}
- MS_MSG_MOD_GETWINDOWFLAGS:PAnsiChar = 'SRMsg_MOD/GetWindowFlags';
-
{$ENDIF}
diff --git a/plugins/TabSRMM/src/msgs.cpp b/plugins/TabSRMM/src/msgs.cpp index f81dfb194b..d83ae79efc 100644 --- a/plugins/TabSRMM/src/msgs.cpp +++ b/plugins/TabSRMM/src/msgs.cpp @@ -370,25 +370,6 @@ static INT_PTR Service_OpenTrayMenu(WPARAM, LPARAM lParam) }
/////////////////////////////////////////////////////////////////////////////////////////
-// service function. retrieves the message window flags for a given hcontact or window
-// wParam == hContact of the window to find
-// lParam == window handle (set it to 0 if you want search for hcontact, otherwise it
-// is directly used as the handle for the target window
-
-static INT_PTR GetMessageWindowFlags(WPARAM wParam, LPARAM lParam)
-{
- HWND hwndTarget = (HWND)lParam;
- if (hwndTarget == 0)
- hwndTarget = M.FindWindow(wParam);
-
- if (hwndTarget == 0)
- return 0;
-
- CSrmmWindow *dat = (CSrmmWindow*)GetWindowLongPtr(hwndTarget, GWLP_USERDATA);
- return (dat) ? dat->m_dwFlags : 0;
-}
-
-/////////////////////////////////////////////////////////////////////////////////////////
// return the version of the window api supported
static INT_PTR BroadcastMessage(WPARAM, LPARAM lParam)
@@ -1127,7 +1108,6 @@ static void TSAPI InitAPI() CreateServiceFunction(MS_TABMSG_TRAYSUPPORT, Service_OpenTrayMenu);
CreateServiceFunction(MS_TABMSG_SLQMGR, CSendLater::svcQMgr);
- CreateServiceFunction(MS_MSG_MOD_GETWINDOWFLAGS, GetMessageWindowFlags);
CreateServiceFunction(MS_MSG_MOD_MESSAGEDIALOGOPENED, MessageWindowOpened);
CreateServiceFunction("SRMsg/BroadcastMessage", BroadcastMessage);
diff --git a/plugins/TabSRMM/src/msgs.h b/plugins/TabSRMM/src/msgs.h index 2e88f7615f..07597dbf75 100644 --- a/plugins/TabSRMM/src/msgs.h +++ b/plugins/TabSRMM/src/msgs.h @@ -1041,12 +1041,6 @@ struct TABSRMM_SessionInfo { //from the hContact.
#define MS_MSG_MOD_MESSAGEDIALOGOPENED "SRMsg_MOD/MessageDialogOpened"
-//obtain the message window flags
-//wParam = hContact - ignored if lParam is given.
-//lParam = hwnd
-//returns MessageWindowData *dat, 0 if no window is found
-#define MS_MSG_MOD_GETWINDOWFLAGS "SRMsg_MOD/GetWindowFlags"
-
// custom tabSRMM events
#define tabMSG_WINDOW_EVT_CUSTOM_BEFORESEND 1
|