From 5a19cc3dfc0e40d61b860dbeeedf802a5047a667 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Mon, 8 Apr 2013 14:55:45 +0000 Subject: - MBF_OWNERSTATE option moved to the public header; - client icon drawing moved to FingerPrint; - old code in tabSRMM completely wiped out; git-svn-id: http://svn.miranda-ng.org/main/trunk@4389 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/TabSRMM/src/commonheaders.h | 5 ----- plugins/TabSRMM/src/functions.h | 4 ---- plugins/TabSRMM/src/modplus.cpp | 41 +------------------------------------ 3 files changed, 1 insertion(+), 49 deletions(-) (limited to 'plugins/TabSRMM/src') diff --git a/plugins/TabSRMM/src/commonheaders.h b/plugins/TabSRMM/src/commonheaders.h index 8b2bdf2609..e1cf7c3a55 100644 --- a/plugins/TabSRMM/src/commonheaders.h +++ b/plugins/TabSRMM/src/commonheaders.h @@ -224,11 +224,6 @@ enum DWMWINDOWATTRIBUTE #define WM_DWMSENDICONICLIVEPREVIEWBITMAP 0x0326 #endif - -/* State of icon with such flag will not be saved, and you must set it manually */ -#define MBF_OWNERSTATE 0x04 - - #if !defined(_WIN64) && !defined(_USE_32BIT_TIME_T) #define _USE_32BIT_TIME_T #else diff --git a/plugins/TabSRMM/src/functions.h b/plugins/TabSRMM/src/functions.h index d5746cca5a..fb6d9e9cd1 100644 --- a/plugins/TabSRMM/src/functions.h +++ b/plugins/TabSRMM/src/functions.h @@ -178,10 +178,6 @@ int TN_OptionsInitialize(WPARAM wParam, LPARAM lParam); int TN_ModuleDeInit(); void TN_TypingMessage(HANDLE hContact, int iMode); -// mod plus - -int ChangeClientIconInStatusBar(const TWindowData *dat); - // hotkeys LRESULT ProcessHotkeysByMsgFilter(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam, UINT_PTR ctrlId); diff --git a/plugins/TabSRMM/src/modplus.cpp b/plugins/TabSRMM/src/modplus.cpp index bc8310eb7b..7288c5b986 100644 --- a/plugins/TabSRMM/src/modplus.cpp +++ b/plugins/TabSRMM/src/modplus.cpp @@ -49,24 +49,8 @@ int g_bStartup=0; BOOL g_bIMGtagButton; -static char* getMirVer(HANDLE hContact) +static TCHAR* getMenuEntry(int i) { - char *szProto = NULL; - char *msg = NULL; - DBVARIANT dbv = {0}; - - szProto = GetContactProto(hContact); - if ( !szProto ) - return (NULL); - - if ( !db_get_s(hContact, szProto, "MirVer", &dbv)) { - msg=mir_strdup(dbv.pszVal); - db_free(&dbv); - } - return (msg); -} - -static TCHAR* getMenuEntry(int i) { TCHAR *msg = NULL; char MEntry[256] = {'\0'}; DBVARIANT dbv = {0}; @@ -79,29 +63,6 @@ static TCHAR* getMenuEntry(int i) { return (msg); } -int ChangeClientIconInStatusBar(const TWindowData *dat) -{ - if (!ServiceExists(MS_FP_GETCLIENTICON)) - return(S_FALSE); - - char *msg = getMirVer(dat->hContact); - - if ( !msg ) - return (S_FALSE); - - StatusIconData sid = {0}; - - sid.cbSize = sizeof(sid); - sid.szModule = (char *)"tabmodplus"; - sid.hIcon = sid.hIconDisabled = dat->hClientIcon; - sid.dwId = 1; - sid.szTooltip = msg; - sid.flags = MBF_OWNERSTATE; - CallService(MS_MSG_MODIFYICON,(WPARAM)dat->hContact, (LPARAM)&sid); - mir_free(msg); - return (S_OK); -} - static int RegisterCustomButton(WPARAM wParam,LPARAM lParam) { if ( ServiceExists(MS_BB_ADDBUTTON)) { -- cgit v1.2.3