From 6640a8f419a9ef61ad7af41a419615c2d07b872e Mon Sep 17 00:00:00 2001 From: George Hazan Date: Sat, 6 Apr 2013 23:05:29 +0000 Subject: menu item flag CMIF_ICONFROMICOLIB is ignored by the core from now on git-svn-id: http://svn.miranda-ng.org/main/trunk@4354 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/AddContactPlus/src/main.cpp | 2 +- plugins/Alarms/src/options.cpp | 2 +- plugins/AutoShutdown/src/settingsdlg.cpp | 2 +- plugins/BasicHistory/src/BasicHistory.cpp | 10 +++------- plugins/BuddyExpectator/src/BuddyExpectator.cpp | 4 ++-- plugins/CSList/src/cslist.cpp | 2 +- plugins/Clist_modern/src/modern_clistmenus.cpp | 4 ++-- plugins/Clist_modern/src/modern_clisttray.cpp | 1 - plugins/Clist_modern/src/modern_cluiframes.cpp | 3 +-- plugins/Clist_modern/src/modern_groupmenu.cpp | 3 --- plugins/Clist_mw/src/CLUIFrames/cluiframes.cpp | 2 +- plugins/Clist_mw/src/groupmenu.cpp | 2 -- plugins/Clist_nicer/src/CLUIFrames/cluiframes.cpp | 4 ++-- plugins/Clist_nicer/src/CLUIFrames/groupmenu.cpp | 5 ----- plugins/CrashDumper/src/crshdmp.cpp | 4 ++-- plugins/Dbx_mmap_SA/src/dialogs.cpp | 2 +- plugins/FTPFileYM/src/ftpfile.cpp | 6 +++--- plugins/FavContacts/src/main.cpp | 1 - plugins/IEView/src/MUCCHTMLBuilder.cpp | 6 +++--- plugins/Import/src/main.cpp | 1 - plugins/ListeningTo/src/listeningto.cpp | 2 +- plugins/MetaContacts/src/meta_services.cpp | 3 +-- plugins/MirOTR/MirOTR/src/mirotrmenu.cpp | 24 +++++++---------------- plugins/MirOTR/MirOTR/src/svcs_menu.cpp | 4 ++-- plugins/NewXstatusNotify/src/main.cpp | 2 +- plugins/NewsAggregator/Src/Menus.cpp | 2 +- plugins/NewsAggregator/Src/Services.cpp | 2 +- plugins/Non-IM Contact/src/main.cpp | 1 - plugins/NotesAndReminders/src/main.cpp | 2 +- plugins/Nudge/src/main.cpp | 2 +- plugins/OpenFolder/src/openFolder.cpp | 2 +- plugins/PasteIt/src/PasteIt.cpp | 2 +- plugins/PluginUpdater/src/PluginUpdater.cpp | 1 - plugins/Quotes/src/Forex.cpp | 7 +++---- plugins/RecentContacts/src/RecentContacts.cpp | 1 - plugins/Restart/src/restart.cpp | 3 +-- plugins/Scriver/src/chat/main.cpp | 5 ++--- plugins/Scriver/src/msgs.cpp | 2 +- plugins/Sessions/Src/Main.cpp | 2 +- plugins/SimpleStatusMsg/src/awaymsg.cpp | 1 - plugins/SimpleStatusMsg/src/main.cpp | 2 +- plugins/SmileyAdd/src/main.cpp | 2 +- plugins/TabSRMM/src/chat/services.cpp | 4 ++-- plugins/TabSRMM/src/globals.cpp | 2 +- plugins/Weather/src/weather_svcs.cpp | 5 ++--- plugins/WhenWasIt/src/hooked_events.cpp | 2 +- plugins/YAMN/src/main.cpp | 1 - 47 files changed, 58 insertions(+), 96 deletions(-) (limited to 'plugins') diff --git a/plugins/AddContactPlus/src/main.cpp b/plugins/AddContactPlus/src/main.cpp index fff077c55c..f8c4f270a2 100644 --- a/plugins/AddContactPlus/src/main.cpp +++ b/plugins/AddContactPlus/src/main.cpp @@ -91,7 +91,7 @@ static int OnAccListChanged(WPARAM, LPARAM) CLISTMENUITEM mi = { sizeof(mi) }; mi.position = 500020001; - mi.flags = CMIF_ICONFROMICOLIB | CMIF_TCHAR; + mi.flags = CMIF_TCHAR; mi.icolibItem = icon.hIcolib; mi.ptszName = LPGENT("&Add contact..."); mi.pszService = MS_ADDCONTACTPLUS_SHOW; diff --git a/plugins/Alarms/src/options.cpp b/plugins/Alarms/src/options.cpp index 39c4713838..ffb359fabb 100644 --- a/plugins/Alarms/src/options.cpp +++ b/plugins/Alarms/src/options.cpp @@ -693,7 +693,7 @@ void AddMenuItem() if (hMainMenuItem) return; CLISTMENUITEM mi = { sizeof(mi) }; - mi.flags = CMIM_ALL | CMIF_ICONFROMICOLIB; + mi.flags = CMIM_ALL; mi.icolibItem = Skin_GetIconHandle("alarms_menu_set"); mi.pszName = "Set Alarm"; mi.pszService = MODULE "/NewAlarm"; diff --git a/plugins/AutoShutdown/src/settingsdlg.cpp b/plugins/AutoShutdown/src/settingsdlg.cpp index 05ed98263d..96e29316e6 100644 --- a/plugins/AutoShutdown/src/settingsdlg.cpp +++ b/plugins/AutoShutdown/src/settingsdlg.cpp @@ -437,7 +437,7 @@ void SetShutdownMenuItem(BOOL fActive) mi.icolibItem = fActive ? iconList[1].hIcolib : iconList[2].hIcolib; mi.ptszName = fActive ? LPGENT("Stop automatic &shutdown") : LPGENT("Automatic &shutdown..."); /* autotranslated */ mi.pszService = "AutoShutdown/MenuCommand"; - mi.flags = CMIF_TCHAR | CMIF_ICONFROMICOLIB; + mi.flags = CMIF_TCHAR; if (hMainMenuItem != NULL) { mi.flags |= CMIM_NAME | CMIM_ICON; Menu_ModifyItem(hMainMenuItem, &mi); diff --git a/plugins/BasicHistory/src/BasicHistory.cpp b/plugins/BasicHistory/src/BasicHistory.cpp index 7810489920..c8ee22d2b8 100644 --- a/plugins/BasicHistory/src/BasicHistory.cpp +++ b/plugins/BasicHistory/src/BasicHistory.cpp @@ -99,7 +99,6 @@ void InitMenuItems() { CLISTMENUITEM mi = { sizeof(mi) }; mi.position = 1000090000; - mi.flags = CMIF_ICONFROMICOLIB; mi.icolibItem = LoadSkinnedIconHandle(SKINICON_OTHER_HISTORY); mi.pszName = LPGEN("View &History"); mi.pszService = MS_HISTORY_SHOWCONTACTHISTORY; @@ -110,7 +109,6 @@ void InitMenuItems() Menu_AddMainMenuItem(&mi); mi.position = 1000090001; - mi.flags = CMIF_ICONFROMICOLIB; mi.icolibItem = LoadSkinnedIconHandle(SKINICON_OTHER_DELETE); mi.pszName = LPGEN("Delete All User History"); mi.pszService = MS_HISTORY_DELETEALLCONTACTHISTORY; @@ -121,13 +119,11 @@ void InitMenuItems() void InitTaskMenuItems() { - if(Options::instance->taskOptions.size() > 0) - { + if(Options::instance->taskOptions.size() > 0) { CLISTMENUITEM mi = { sizeof(mi) }; - if(hTaskMainMenu == NULL) - { + if(hTaskMainMenu == NULL) { mi.position = 500060005; - mi.flags = CMIF_ROOTPOPUP | CMIF_ICONFROMICOLIB; + mi.flags = CMIF_ROOTPOPUP; mi.icolibItem = LoadSkinnedIconHandle(SKINICON_OTHER_HISTORY); mi.pszName = LPGEN("Execute history task"); hTaskMainMenu = Menu_AddMainMenuItem(&mi); diff --git a/plugins/BuddyExpectator/src/BuddyExpectator.cpp b/plugins/BuddyExpectator/src/BuddyExpectator.cpp index 13a6303ee3..54864b2e89 100644 --- a/plugins/BuddyExpectator/src/BuddyExpectator.cpp +++ b/plugins/BuddyExpectator/src/BuddyExpectator.cpp @@ -447,7 +447,7 @@ int onPrebuildContactMenu(WPARAM wParam, LPARAM lParam) return 0; CLISTMENUITEM mi = { sizeof(mi) }; - mi.flags = CMIM_ICON | CMIM_NAME | CMIF_ICONFROMICOLIB | CMIF_TCHAR; + mi.flags = CMIM_ICON | CMIM_NAME | CMIF_TCHAR; if (db_get_b((HANDLE)wParam, MODULE_NAME, "MissYou", 0)) { mi.ptszName = LPGENT("Disable Miss You"); mi.icolibItem = iconList[1].hIcolib; @@ -643,7 +643,7 @@ int ModulesLoaded(WPARAM wParam, LPARAM lParam) HookEvent(ME_CLIST_PREBUILDCONTACTMENU, onPrebuildContactMenu); CLISTMENUITEM mi = { sizeof(mi) }; - mi.flags = CMIF_ICONFROMICOLIB | CMIF_TCHAR; + mi.flags = CMIF_TCHAR; mi.icolibItem = iconList[2].hIcolib; mi.position = 200000; mi.ptszName = LPGENT("Enable Miss You"); diff --git a/plugins/CSList/src/cslist.cpp b/plugins/CSList/src/cslist.cpp index 4fe55e4279..98f0c86410 100644 --- a/plugins/CSList/src/cslist.cpp +++ b/plugins/CSList/src/cslist.cpp @@ -247,7 +247,7 @@ void addProtoStatusMenuItem(char *protoName) CreateServiceFunctionParam(buf, showList, (LPARAM)protoName); CLISTMENUITEM mi = { sizeof(mi) }; - mi.flags = CMIF_CHILDPOPUP | CMIF_TCHAR | CMIF_ICONFROMICOLIB; + mi.flags = CMIF_CHILDPOPUP | CMIF_TCHAR; mi.icolibItem = forms[0].hIcoLibItem; mi.ptszName = _T(MODULENAME); mi.position = 2000040000; diff --git a/plugins/Clist_modern/src/modern_clistmenus.cpp b/plugins/Clist_modern/src/modern_clistmenus.cpp index 42a1d0b016..a4b940bbbe 100644 --- a/plugins/Clist_modern/src/modern_clistmenus.cpp +++ b/plugins/Clist_modern/src/modern_clistmenus.cpp @@ -110,7 +110,7 @@ static int FAV_OnContactMenuBuild(WPARAM wParam,LPARAM lParam) mir_sntprintf(name, bufsize/sizeof(TCHAR), _T("%s (%s)"),FAVMENUROOTNAME,rates[bContactRate]); mi.ptszName = name; } - mi.flags = CMIF_ROOTPOPUP | CMIF_TCHAR | CMIF_ICONFROMICOLIB; + mi.flags = CMIF_ROOTPOPUP | CMIF_TCHAR; if ( !hFavoriteContactMenu) hFavoriteContactMenu = Menu_AddContactMenuItem(&mi); else { @@ -135,7 +135,7 @@ static int FAV_OnContactMenuBuild(WPARAM wParam,LPARAM lParam) for (i=0; i < SIZEOF(rates); i++) { mi.icolibItem = iconList[i].hIcolib; mi.ptszName = rates[i]; - mi.flags = CMIF_CHILDPOPUP | CMIF_TCHAR | ((bContactRate == i)?CMIF_CHECKED:0) | CMIF_ICONFROMICOLIB; + mi.flags = CMIF_CHILDPOPUP | CMIF_TCHAR | ((bContactRate == i) ? CMIF_CHECKED : 0); mi.pszService = CLUI_FAVSETRATE; mi.popupPosition = i; if (bModifyMenu && hFavoriteContactMenuItems[i]) { diff --git a/plugins/Clist_modern/src/modern_clisttray.cpp b/plugins/Clist_modern/src/modern_clisttray.cpp index b4339c7720..f99b24ca6d 100644 --- a/plugins/Clist_modern/src/modern_clisttray.cpp +++ b/plugins/Clist_modern/src/modern_clisttray.cpp @@ -612,7 +612,6 @@ void InitTrayMenus(void) mi.position = 900000; mi.pszService = "CloseAction"; mi.pszName = LPGEN("E&xit"); - mi.flags = CMIF_ICONFROMICOLIB; mi.icolibItem = LoadSkinnedIconHandle(SKINICON_OTHER_EXIT); AddTrayMenuItem(0, (LPARAM)&mi); diff --git a/plugins/Clist_modern/src/modern_cluiframes.cpp b/plugins/Clist_modern/src/modern_cluiframes.cpp index 1f0bdb8beb..c6cad48918 100644 --- a/plugins/Clist_modern/src/modern_cluiframes.cpp +++ b/plugins/Clist_modern/src/modern_cluiframes.cpp @@ -827,7 +827,6 @@ static HMENU CLUIFramesCreateMenuForFrame(int frameid,int root,int popuppos,HGEN return NULL; CLISTMENUITEM mi = { sizeof(mi) }; - mi.flags = CMIF_ICONFROMICOLIB; mi.pszPopupName = (char *)root; mi.popupPosition = frameid; mi.position = popuppos++; @@ -1719,7 +1718,7 @@ static int CLUIFramesLoadMainMenu() // create root menu CLISTMENUITEM mi = { sizeof(mi) }; - mi.flags = CMIF_ICONFROMICOLIB | CMIF_ROOTHANDLE; + mi.flags = CMIF_ROOTHANDLE; mi.icolibItem = LoadSkinnedIconHandle(SKINICON_OTHER_FRAME); mi.position = 3000090000; mi.pszName = LPGEN("Frames"); diff --git a/plugins/Clist_modern/src/modern_groupmenu.cpp b/plugins/Clist_modern/src/modern_groupmenu.cpp index ab78f0f0b6..5f6ac01363 100644 --- a/plugins/Clist_modern/src/modern_groupmenu.cpp +++ b/plugins/Clist_modern/src/modern_groupmenu.cpp @@ -296,7 +296,6 @@ void GroupMenus_Init(void) mi.pszService = "CloseAction"; mi.icolibItem = LoadSkinnedIconHandle(SKINICON_OTHER_EXIT); mi.pszName = LPGEN("E&xit"); - mi.flags = CMIF_ICONFROMICOLIB; AddGroupMenuItem(0, (LPARAM)&mi); mi.position = 500; @@ -609,7 +608,6 @@ void InitSubGroupMenus(void) memset(&mi, 0, sizeof(mi)); mi.cbSize = sizeof(mi); mi.position = 900001; - mi.flags = CMIF_ICONFROMICOLIB; mi.icolibItem = LoadSkinnedIconHandle(SKINICON_OTHER_RENAME); mi.pszService = "CLISTMENUSSubGroup/GroupMenuExecProxy"; mi.pszName = LPGEN("&Rename Group"); @@ -618,7 +616,6 @@ void InitSubGroupMenus(void) DestroyIcon_protect(mi.hIcon); mi.position = 900002; - mi.flags = CMIF_ICONFROMICOLIB; mi.icolibItem = LoadSkinnedIconHandle(SKINICON_OTHER_DELETE); mi.pszService = "CLISTMENUSSubGroup/GroupMenuExecProxy"; mi.pszName = LPGEN("&Delete Group"); diff --git a/plugins/Clist_mw/src/CLUIFrames/cluiframes.cpp b/plugins/Clist_mw/src/CLUIFrames/cluiframes.cpp index 4441022cfa..f9676744c2 100644 --- a/plugins/Clist_mw/src/CLUIFrames/cluiframes.cpp +++ b/plugins/Clist_mw/src/CLUIFrames/cluiframes.cpp @@ -1414,7 +1414,7 @@ static int CLUIFramesLoadMainMenu() // create root menu CLISTMENUITEM mi = { sizeof(mi) }; mi.icolibItem = LoadSkinnedIconHandle(SKINICON_OTHER_FRAME); - mi.flags = CMIF_ROOTPOPUP | CMIF_ICONFROMICOLIB; + mi.flags = CMIF_ROOTPOPUP; mi.position = 3000090000; mi.pszPopupName = (char*)-1; mi.pszName = LPGEN("Frames"); diff --git a/plugins/Clist_mw/src/groupmenu.cpp b/plugins/Clist_mw/src/groupmenu.cpp index 121f166b26..01f428247d 100644 --- a/plugins/Clist_mw/src/groupmenu.cpp +++ b/plugins/Clist_mw/src/groupmenu.cpp @@ -596,7 +596,6 @@ void InitSubGroupMenus(void) memset(&mi,0,sizeof(mi)); mi.cbSize = sizeof(mi); mi.position = 900001; - mi.flags = CMIF_ICONFROMICOLIB; mi.icolibItem = LoadSkinnedIconHandle(SKINICON_OTHER_RENAME); //LoadIcon(GetModuleHandle(NULL),MAKEINTRESOURCE(IDI_RENAME)); mi.pszService = "CLISTMENUSSubGroup/GroupMenuExecProxy"; mi.pszName = LPGEN("&Rename Group"); @@ -606,7 +605,6 @@ void InitSubGroupMenus(void) memset(&mi,0,sizeof(mi)); mi.cbSize = sizeof(mi); mi.position = 900002; - mi.flags = CMIF_ICONFROMICOLIB; mi.icolibItem = LoadSkinnedIconHandle(SKINICON_OTHER_DELETE); //LoadIcon(GetModuleHandle(NULL),MAKEINTRESOURCE(IDI_DELETE)); mi.pszService = "CLISTMENUSSubGroup/GroupMenuExecProxy"; mi.pszName = LPGEN("&Delete Group"); diff --git a/plugins/Clist_nicer/src/CLUIFrames/cluiframes.cpp b/plugins/Clist_nicer/src/CLUIFrames/cluiframes.cpp index 052ef37f2d..e371374fe7 100644 --- a/plugins/Clist_nicer/src/CLUIFrames/cluiframes.cpp +++ b/plugins/Clist_nicer/src/CLUIFrames/cluiframes.cpp @@ -648,7 +648,7 @@ HMENU CLUIFramesCreateMenuForFrame(int frameid, int root, int popuppos, HGENMENU mi.popupPosition = frameid; mi.position = popuppos++; mi.pszName = LPGEN("&FrameTitle"); - mi.flags = CMIF_CHILDPOPUP | CMIF_GRAYED | CMIF_ICONFROMICOLIB; + mi.flags = CMIF_CHILDPOPUP | CMIF_GRAYED; mi.pszContactOwner = 0; menuid = pfnAdd(&mi); if (frameid == -1) contMITitle = menuid; @@ -1599,7 +1599,7 @@ static int CLUIFramesLoadMainMenu() // create root menu CLISTMENUITEM mi = { sizeof(mi) }; mi.icolibItem = LoadSkinnedIconHandle(SKINICON_OTHER_FRAME); - mi.flags = CMIF_ROOTHANDLE | CMIF_ICONFROMICOLIB; + mi.flags = CMIF_ROOTHANDLE; mi.position = 3000090000; mi.pszPopupName = (char*) - 1; mi.pszName = LPGEN("Frames"); diff --git a/plugins/Clist_nicer/src/CLUIFrames/groupmenu.cpp b/plugins/Clist_nicer/src/CLUIFrames/groupmenu.cpp index fd261b6f6a..2bb67ac6c4 100644 --- a/plugins/Clist_nicer/src/CLUIFrames/groupmenu.cpp +++ b/plugins/Clist_nicer/src/CLUIFrames/groupmenu.cpp @@ -315,7 +315,6 @@ void InitGroupMenus(void) memset(&mi,0,sizeof(mi)); mi.cbSize=sizeof(mi); mi.position=200000; - mi.flags = CMIF_ICONFROMICOLIB; mi.icolibItem=LoadSkinnedIconHandle(SKINICON_OTHER_FINDUSER); //LoadIcon(GetModuleHandle(NULL), MAKEINTRESOURCE(IDI_FINDUSER)); mi.pszService="FindAdd/FindAddCommand"; mi.pszName=LPGEN("&Find/Add Contacts..."); @@ -345,7 +344,6 @@ void InitGroupMenus(void) memset(&mi,0,sizeof(mi)); mi.cbSize=sizeof(mi); mi.position=400000; - mi.flags = CMIF_ICONFROMICOLIB; mi.icolibItem=LoadSkinnedIconHandle(SKINICON_OTHER_OPTIONS); //LoadIcon(GetModuleHandle(NULL),MAKEINTRESOURCE(IDI_OPTIONS)); mi.pszService="Options/OptionsCommand"; mi.pszName=LPGEN("&Options..."); @@ -355,7 +353,6 @@ void InitGroupMenus(void) memset(&mi,0,sizeof(mi)); mi.cbSize=sizeof(mi); mi.position=500000; - mi.flags = CMIF_ICONFROMICOLIB; mi.icolibItem=LoadSkinnedIconHandle(SKINICON_OTHER_MIRANDA); //LoadIcon(GetModuleHandle(NULL),MAKEINTRESOURCE(IDI_MIRANDA)); mi.pszService="CLN/About"; mi.pszName=LPGEN("&About the contact list..."); @@ -637,7 +634,6 @@ void InitSubGroupMenus(void) memset(&mi,0,sizeof(mi)); mi.cbSize=sizeof(mi); mi.position=900001; - mi.flags = CMIF_ICONFROMICOLIB; mi.icolibItem=LoadSkinnedIconHandle(SKINICON_OTHER_RENAME); //LoadIcon(GetModuleHandle(NULL),MAKEINTRESOURCE(IDI_RENAME)); mi.pszService="CLISTMENUSSubGroup/GroupMenuExecProxy"; mi.pszName=LPGEN("&Rename Group"); @@ -647,7 +643,6 @@ void InitSubGroupMenus(void) memset(&mi,0,sizeof(mi)); mi.cbSize=sizeof(mi); mi.position=900002; - mi.flags = CMIF_ICONFROMICOLIB; mi.icolibItem=LoadSkinnedIconHandle(SKINICON_OTHER_DELETE); //LoadIcon(GetModuleHandle(NULL),MAKEINTRESOURCE(IDI_DELETE)); mi.pszService="CLISTMENUSSubGroup/GroupMenuExecProxy"; mi.pszName=LPGEN("&Delete Group"); diff --git a/plugins/CrashDumper/src/crshdmp.cpp b/plugins/CrashDumper/src/crshdmp.cpp index c9ec9a7b76..7bb5e53445 100644 --- a/plugins/CrashDumper/src/crshdmp.cpp +++ b/plugins/CrashDumper/src/crshdmp.cpp @@ -253,13 +253,13 @@ static int ModulesLoaded(WPARAM, LPARAM) CLISTMENUITEM mi = { sizeof(mi) }; mi.popupPosition = 2000089999; mi.position = 2000089999; - mi.flags = CMIF_ROOTPOPUP | CMIF_ICONFROMICOLIB | CMIF_TCHAR; + mi.flags = CMIF_ROOTPOPUP | CMIF_TCHAR; mi.icolibItem = GetIconHandle(IDI_VI); mi.ptszName = LPGENT("Version Information"); mi.pszPopupName = (char *)-1; HANDLE hMenuRoot = Menu_AddMainMenuItem(&mi); - mi.flags = CMIF_CHILDPOPUP | CMIF_ICONFROMICOLIB | CMIF_TCHAR; + mi.flags = CMIF_CHILDPOPUP | CMIF_TCHAR; mi.pszPopupName = (char *)hMenuRoot; mi.popupPosition = 0; diff --git a/plugins/Dbx_mmap_SA/src/dialogs.cpp b/plugins/Dbx_mmap_SA/src/dialogs.cpp index c1b8e29d1f..4af9f177ac 100644 --- a/plugins/Dbx_mmap_SA/src/dialogs.cpp +++ b/plugins/Dbx_mmap_SA/src/dialogs.cpp @@ -97,7 +97,7 @@ int InitMenus(void *obj, WPARAM, LPARAM) // main menu item CLISTMENUITEM mi = { sizeof(mi) }; - mi.flags = CMIM_ALL | CMIF_TCHAR | CMIF_ICONFROMICOLIB; + mi.flags = CMIM_ALL | CMIF_TCHAR; mi.icolibItem = iconList[1].hIcolib; mi.ptszName = (p->m_bEncoding) ? LPGENT("Change password") : LPGENT("Set password"); mi.ptszPopupName = LPGENT("Database"); diff --git a/plugins/FTPFileYM/src/ftpfile.cpp b/plugins/FTPFileYM/src/ftpfile.cpp index d0747f234b..53b2c5ef1f 100644 --- a/plugins/FTPFileYM/src/ftpfile.cpp +++ b/plugins/FTPFileYM/src/ftpfile.cpp @@ -93,7 +93,7 @@ void InitMenuItems() TCHAR stzName[256]; CLISTMENUITEM mi = { sizeof(mi) }; - mi.flags = CMIF_ROOTPOPUP | CMIF_ICONFROMICOLIB | CMIF_TCHAR; + mi.flags = CMIF_ROOTPOPUP | CMIF_TCHAR; mi.icolibItem = iconList[ServerList::FTP_COUNT].hIcolib; mi.position = 3000090001; mi.ptszName = LPGENT("FTP File"); @@ -115,7 +115,7 @@ void InitMenuItems() if (DB::getStringF(0, MODULE, "Name%d", i, stzName)) mir_sntprintf(stzName, SIZEOF(stzName), TranslateT("FTP Server %d"), i + 1); - mi.flags = CMIF_ICONFROMICOLIB | CMIF_TCHAR; + mi.flags = CMIF_TCHAR; mi.hParentMenu = 0; if (opt.bUseSubmenu) { @@ -164,7 +164,7 @@ void InitMenuItems() memset(&mi, 0, sizeof(mi)); mi.cbSize = sizeof(mi); - mi.flags = CMIF_ICONFROMICOLIB | CMIF_CHILDPOPUP | CMIF_ROOTHANDLE | CMIF_TCHAR; + mi.flags = CMIF_CHILDPOPUP | CMIF_ROOTHANDLE | CMIF_TCHAR; mi.icolibItem = iconList[ServerList::FTP_COUNT].hIcolib; mi.position = 3000090001; mi.ptszName = LPGENT("FTP File manager"); diff --git a/plugins/FavContacts/src/main.cpp b/plugins/FavContacts/src/main.cpp index 7e065d60fd..fdef5aeb9b 100644 --- a/plugins/FavContacts/src/main.cpp +++ b/plugins/FavContacts/src/main.cpp @@ -299,7 +299,6 @@ extern "C" __declspec(dllexport) int Load(void) #ifdef _DEBUG CLISTMENUITEM mi = { sizeof(mi) }; - mi.flags = CMIF_ICONFROMICOLIB; mi.icolibItem = LoadSkinnedIconHandle(SKINICON_OTHER_OPTIONS); mi.position = 1900000000; mi.pszName = LPGEN("&Favourite Contacts..."); diff --git a/plugins/IEView/src/MUCCHTMLBuilder.cpp b/plugins/IEView/src/MUCCHTMLBuilder.cpp index ee70762939..e8d5b30c19 100644 --- a/plugins/IEView/src/MUCCHTMLBuilder.cpp +++ b/plugins/IEView/src/MUCCHTMLBuilder.cpp @@ -186,9 +186,9 @@ void MUCCHTMLBuilder::appendEventNonTemplate(IEView *view, IEVIEWEVENT *event) { for (int eventIdx = 0; eventData!=NULL && (eventIdx < event->count || event->count==-1); eventData = eventData->next, eventIdx++) { DWORD dwData = eventData->dwData; char *style = NULL; - int styleSize; - int isSent = eventData->bIsMe; - int outputSize; + int styleSize; + bool isSent = eventData->bIsMe != 0; + int outputSize; char *output = NULL; mir_ptr szName, szText; if (eventData->iType == IEED_MUCC_EVENT_MESSAGE) { diff --git a/plugins/Import/src/main.cpp b/plugins/Import/src/main.cpp index c5cb25aa7e..4329e6a5c5 100644 --- a/plugins/Import/src/main.cpp +++ b/plugins/Import/src/main.cpp @@ -124,7 +124,6 @@ extern "C" __declspec(dllexport) int Load(void) mi.pszName = LPGEN("&Import..."); mi.position = 500050000; mi.pszService = IMPORT_SERVICE; - mi.flags = CMIF_ICONFROMICOLIB; Menu_AddMainMenuItem(&mi); HookEvent(ME_SYSTEM_MODULESLOADED, ModulesLoaded); diff --git a/plugins/ListeningTo/src/listeningto.cpp b/plugins/ListeningTo/src/listeningto.cpp index 6e82365846..62ecd7c48e 100644 --- a/plugins/ListeningTo/src/listeningto.cpp +++ b/plugins/ListeningTo/src/listeningto.cpp @@ -320,7 +320,7 @@ int ModulesLoaded(WPARAM wParam, LPARAM lParam) CLISTMENUITEM mi = { sizeof(mi) }; mi.position = 500080000; mi.ptszName = LPGENT("Listening to"); - mi.flags = CMIF_ROOTPOPUP | CMIF_ICONFROMICOLIB | CMIF_TCHAR; + mi.flags = CMIF_ROOTPOPUP | CMIF_TCHAR; mi.icolibItem = iconList[0].hIcolib; hMainMenuGroup = Menu_AddMainMenuItem(&mi); diff --git a/plugins/MetaContacts/src/meta_services.cpp b/plugins/MetaContacts/src/meta_services.cpp index 042a0e43a1..5a02ddfe42 100755 --- a/plugins/MetaContacts/src/meta_services.cpp +++ b/plugins/MetaContacts/src/meta_services.cpp @@ -1003,7 +1003,7 @@ int Meta_ModulesLoaded(WPARAM wParam, LPARAM lParam) //////////////////////////////////////////////////////////////////////////// CLISTMENUITEM mi = { sizeof(mi) }; - mi.flags = CMIM_ALL | CMIF_ICONFROMICOLIB; + mi.flags = CMIM_ALL; // main menu item mi.icolibItem = GetIconHandle(I_MENUOFF); @@ -1047,7 +1047,6 @@ int Meta_ModulesLoaded(WPARAM wParam, LPARAM lParam) mi.pszContactOwner = META_PROTO; mi.position = -99000; - mi.flags &= ~CMIF_ICONFROMICOLIB; for (i = 0; i < MAX_CONTACTS; i++) { mi.position--; strcpy(buffer3, (char *)Translate("Context")); diff --git a/plugins/MirOTR/MirOTR/src/mirotrmenu.cpp b/plugins/MirOTR/MirOTR/src/mirotrmenu.cpp index 03d5f70a39..0b94d69c66 100644 --- a/plugins/MirOTR/MirOTR/src/mirotrmenu.cpp +++ b/plugins/MirOTR/MirOTR/src/mirotrmenu.cpp @@ -106,7 +106,7 @@ INT_PTR MirOTRMenuCheckService(WPARAM wParam,LPARAM) if ( mi.flags & CMIF_NOTNOTPRIVATE && level==TRUST_NOT_PRIVATE ) return FALSE; if (pcpp->MenuItemHandle == hStatusInfoItem) { - mi.flags = CMIM_NAME | CMIM_ICON | CMIF_ICONFROMICOLIB | CMIF_TCHAR; + mi.flags = CMIM_NAME | CMIM_ICON | CMIF_TCHAR; switch (level) { case TRUST_PRIVATE: mi.hIcolibItem = GetIconHandle(ICON_PRIVATE); @@ -190,7 +190,6 @@ void ShowOTRMenu(HANDLE hContact, POINT pt){ void InitMirOTRMenu(void) { - WNDCLASS wc = {0}; wc.hInstance = hInst; wc.lpfnWndProc = PopupMenuWndProc; @@ -205,14 +204,9 @@ void InitMirOTRMenu(void) CreateServiceFunction("MIROTRMENUS/FreeOwnerDataMirOTRMenu",FreeOwnerDataMirOTRMenu); CreateServiceFunction("MIROTRMENUS/OnAddMenuItemMirOTRMenu",OnAddMenuItemMirOTRMenu); - CreateServiceFunction(MS_MIROTR_ADDMIROTRMENUITEM,AddMirOTRMenuItem); CreateServiceFunction(MS_MIROTR_MENUBUILDMIROTR,BuildMirOTRMenu); CreateServiceFunction(MS_MIROTR_REMOVEMIROTRMENUITEM,RemoveMirOTRMenuItem); - - //hPreBuildMirOTRMenuEvent=CreateHookableEvent(ME_CLIST_PREBUILDMirOTRMENU); - - //MirOTR menu { TMenuParam tmp = { 0 }; tmp.cbSize=sizeof(tmp); @@ -236,37 +230,36 @@ void InitMirOTRMenu(void) params.Value = (INT_PTR)"MIROTRMENUS/OnAddMenuItemMirOTRMenu"; CallService(MO_SETOPTIONSMENUOBJECT, 0, (LPARAM)¶ms); - MIROTRMENUITEM mi = {0}; mi.cbSize = sizeof(mi); - mi.flags = CMIF_DISABLED|CMIF_TCHAR|CMIF_ICONFROMICOLIB; + mi.flags = CMIF_DISABLED | CMIF_TCHAR; mi.ptszName = LPGENT("OTR Status"); mi.position = 0; hStatusInfoItem = (HGENMENU) AddMirOTRMenuItem(0, (LPARAM) &mi); - mi.flags = CMIF_TCHAR|CMIF_ICONFROMICOLIB|CMIF_NOTPRIVATE|CMIF_NOTUNVERIFIED; + mi.flags = CMIF_TCHAR | CMIF_NOTPRIVATE | CMIF_NOTUNVERIFIED; mi.ptszName = _T(LANG_MENU_START); mi.position = 100001; mi.pszService = MS_OTR_MENUSTART; mi.icolibItem = GetIconHandle(ICON_UNVERIFIED); AddMirOTRMenuItem(0, (LPARAM) &mi); - mi.flags = CMIF_TCHAR|CMIF_ICONFROMICOLIB|CMIF_NOTNOTPRIVATE|CMIF_NOTFINISHED; + mi.flags = CMIF_TCHAR | CMIF_NOTNOTPRIVATE | CMIF_NOTFINISHED; mi.ptszName = _T(LANG_MENU_REFRESH); mi.position = 100002; mi.pszService = MS_OTR_MENUREFRESH; mi.icolibItem = GetIconHandle(ICON_FINISHED); AddMirOTRMenuItem(0, (LPARAM) &mi); - mi.flags = CMIF_TCHAR|CMIF_ICONFROMICOLIB|CMIF_NOTNOTPRIVATE; + mi.flags = CMIF_TCHAR | CMIF_NOTNOTPRIVATE; mi.ptszName = _T(LANG_MENU_STOP); mi.position = 100003; mi.pszService = MS_OTR_MENUSTOP; mi.icolibItem = GetIconHandle(ICON_NOT_PRIVATE); AddMirOTRMenuItem(0, (LPARAM) &mi); - mi.flags = CMIF_TCHAR|CMIF_ICONFROMICOLIB|CMIF_NOTNOTPRIVATE|CMIF_NOTFINISHED; + mi.flags = CMIF_TCHAR | CMIF_NOTNOTPRIVATE | CMIF_NOTFINISHED; mi.ptszName = _T(LANG_MENU_VERIFY); mi.position = 200001; mi.pszService = MS_OTR_MENUVERIFY; @@ -278,9 +271,6 @@ void InitMirOTRMenu(void) mi.position = 300001; mi.pszService = MS_OTR_MENUTOGGLEHTML; hHTMLConvMenuItem = (HGENMENU) AddMirOTRMenuItem(0, (LPARAM) &mi); - - - } void UninitMirOTRMenu(void) @@ -290,4 +280,4 @@ void UninitMirOTRMenu(void) UnregisterClass(_T("MirOTRPopUpMenuProcessor"), hInst); if ( hMirOTRMenuObject ) CallService( MO_REMOVEMENUOBJECT, (WPARAM)hMirOTRMenuObject, 0 ); hMirOTRMenuObject = 0; -} \ No newline at end of file +} diff --git a/plugins/MirOTR/MirOTR/src/svcs_menu.cpp b/plugins/MirOTR/MirOTR/src/svcs_menu.cpp index f1885a31a3..9a7e4a7488 100644 --- a/plugins/MirOTR/MirOTR/src/svcs_menu.cpp +++ b/plugins/MirOTR/MirOTR/src/svcs_menu.cpp @@ -132,7 +132,7 @@ void InitMenu() CreateServiceFunction(MS_OTR_MENUTOGGLEHTML, SVC_ToggleHTMLOTR); CLISTMENUITEM mi = { sizeof(mi) }; - mi.flags = CMIF_NOTOFFLINE | CMIF_TCHAR | CMIF_ICONFROMICOLIB; + mi.flags = CMIF_NOTOFFLINE | CMIF_TCHAR; mi.position = -400000; mi.ptszName = _T(LANG_STOP_OTR); @@ -155,7 +155,7 @@ int SVC_PrebuildContactMenu(WPARAM wParam, LPARAM lParam) HANDLE hContact = (HANDLE)wParam; CLISTMENUITEM mi = { sizeof(mi) }; - mi.flags = CMIM_FLAGS | CMIF_NOTOFFLINE | CMIF_TCHAR | CMIF_ICONFROMICOLIB; + mi.flags = CMIM_FLAGS | CMIF_NOTOFFLINE | CMIF_TCHAR; const char *proto = contact_get_proto(hContact); DWORD pol = CONTACT_DEFAULT_POLICY; diff --git a/plugins/NewXstatusNotify/src/main.cpp b/plugins/NewXstatusNotify/src/main.cpp index 1dc3bf3188..093dd46ac2 100644 --- a/plugins/NewXstatusNotify/src/main.cpp +++ b/plugins/NewXstatusNotify/src/main.cpp @@ -1059,7 +1059,7 @@ INT_PTR EnableDisableMenuCommand(WPARAM wParam, LPARAM lParam) void InitMainMenuItem() { CLISTMENUITEM mi = { sizeof(mi) }; - mi.flags = CMIF_TCHAR | CMIF_ICONFROMICOLIB; + mi.flags = CMIF_TCHAR; mi.ptszPopupName = ServiceExists(MS_POPUP_ADDPOPUP) ? _T("PopUps") : NULL; mi.pszService = MS_STATUSCHANGE_MENUCOMMAND; hEnableDisableMenu = Menu_AddMainMenuItem(&mi); diff --git a/plugins/NewsAggregator/Src/Menus.cpp b/plugins/NewsAggregator/Src/Menus.cpp index d58654d4ea..1299e03af5 100644 --- a/plugins/NewsAggregator/Src/Menus.cpp +++ b/plugins/NewsAggregator/Src/Menus.cpp @@ -25,7 +25,7 @@ VOID InitMenu() { CLISTMENUITEM mi = { sizeof(mi) }; mi.pszContactOwner = MODULE; - mi.flags = CMIF_TCHAR | CMIF_ICONFROMICOLIB | CMIF_NOTOFFLINE; + mi.flags = CMIF_TCHAR | CMIF_NOTOFFLINE; // adding main menu items mi.ptszPopupName = LPGENT("News Aggregator"); diff --git a/plugins/NewsAggregator/Src/Services.cpp b/plugins/NewsAggregator/Src/Services.cpp index 622723f205..238e7f1145 100644 --- a/plugins/NewsAggregator/Src/Services.cpp +++ b/plugins/NewsAggregator/Src/Services.cpp @@ -254,7 +254,7 @@ void UpdateMenu(BOOL State) mi.icolibItem = GetIconHandle("disabled"); } - mi.flags = CMIM_ICON | CMIM_NAME | CMIF_ICONFROMICOLIB | CMIF_TCHAR; + mi.flags = CMIM_ICON | CMIM_NAME | CMIF_TCHAR; Menu_ModifyItem(hService2[0], &mi); CallService(MS_TTB_SETBUTTONSTATE, (WPARAM)hTBButton, State ? TTBST_PUSHED : TTBST_RELEASED); db_set_b(NULL, MODULE, "AutoUpdate", !State); diff --git a/plugins/Non-IM Contact/src/main.cpp b/plugins/Non-IM Contact/src/main.cpp index 4aca53a150..02df17e56d 100644 --- a/plugins/Non-IM Contact/src/main.cpp +++ b/plugins/Non-IM Contact/src/main.cpp @@ -147,7 +147,6 @@ extern "C" __declspec(dllexport) int Load() CreateServiceFunction("NIM_Contact/DoubleClick", doubleClick); CLISTMENUITEM mi = { sizeof(mi) }; - mi.flags = CMIF_ICONFROMICOLIB; mi.position = 600090000; mi.pszPopupName = LPGEN("&Non-IM Contact"); mi.popupPosition = 600090000; diff --git a/plugins/NotesAndReminders/src/main.cpp b/plugins/NotesAndReminders/src/main.cpp index 2322ca2f7b..386cc792fb 100644 --- a/plugins/NotesAndReminders/src/main.cpp +++ b/plugins/NotesAndReminders/src/main.cpp @@ -187,7 +187,7 @@ int OnModulesLoaded(WPARAM wparam, LPARAM lparam) CLISTMENUITEM mi = { sizeof(mi) }; mi.pszContactOwner = NULL; mi.ptszPopupName = LPGENT("Notes && Reminders"); - mi.flags = CMIF_TCHAR | CMIF_ICONFROMICOLIB; + mi.flags = CMIF_TCHAR; mi.position = 1600000000; mi.icolibItem = iconList[2].hIcolib; diff --git a/plugins/Nudge/src/main.cpp b/plugins/Nudge/src/main.cpp index 73caaf1db3..e675a22868 100644 --- a/plugins/Nudge/src/main.cpp +++ b/plugins/Nudge/src/main.cpp @@ -674,7 +674,7 @@ void Nudge_AddAccount(PROTOACCOUNT *proto) mi.popupPosition = 500085000; mi.pszContactOwner = proto->szModuleName; mi.pszPopupName = proto->szModuleName; - mi.flags = CMIF_NOTOFFLINE | CMIF_TCHAR | CMIF_ICONFROMICOLIB; + mi.flags = CMIF_NOTOFFLINE | CMIF_TCHAR; mi.position = -500050004; mi.icolibItem = newNudge->item.hIcoLibItem; mi.ptszName = LPGENT( "Send &Nudge" ); diff --git a/plugins/OpenFolder/src/openFolder.cpp b/plugins/OpenFolder/src/openFolder.cpp index ec6f3c90fa..17e242acac 100644 --- a/plugins/OpenFolder/src/openFolder.cpp +++ b/plugins/OpenFolder/src/openFolder.cpp @@ -75,7 +75,7 @@ static int ModulesLoaded(WPARAM wParam, LPARAM lParam) CLISTMENUITEM mi = { sizeof(mi) }; mi.position = 0x7FFFFFFF; - mi.flags = CMIF_ICONFROMICOLIB|CMIF_TCHAR; + mi.flags = CMIF_TCHAR; mi.icolibItem = icon.hIcolib; mi.ptszName = LPGENT("Open Folder"); mi.pszService = MS_OPENFOLDER_OPEN; diff --git a/plugins/PasteIt/src/PasteIt.cpp b/plugins/PasteIt/src/PasteIt.cpp index 3c30104e26..d8466a2033 100644 --- a/plugins/PasteIt/src/PasteIt.cpp +++ b/plugins/PasteIt/src/PasteIt.cpp @@ -348,7 +348,7 @@ INT_PTR ContactMenuService(WPARAM wParam, LPARAM lParam) void InitMenuItems() { CLISTMENUITEM mi = { sizeof(mi) }; - mi.flags = CMIF_ROOTPOPUP | CMIF_ICONFROMICOLIB | CMIF_TCHAR; + mi.flags = CMIF_ROOTPOPUP | CMIF_TCHAR; mi.icolibItem = icon.hIcolib; mi.position = 3000090005; mi.ptszName = LPGENT("Paste It"); diff --git a/plugins/PluginUpdater/src/PluginUpdater.cpp b/plugins/PluginUpdater/src/PluginUpdater.cpp index d0875df06c..fbd28aa8af 100644 --- a/plugins/PluginUpdater/src/PluginUpdater.cpp +++ b/plugins/PluginUpdater/src/PluginUpdater.cpp @@ -105,7 +105,6 @@ extern "C" __declspec(dllexport) int Load(void) CLISTMENUITEM mi = { sizeof(mi) }; mi.position = -0x7FFFFFFF; - mi.flags = CMIF_ICONFROMICOLIB; mi.icolibItem = Skin_GetIconHandle("check_update"); mi.pszName = LPGEN("Check for plugin updates"); mi.pszService = MODNAME"/CheckUpdates"; diff --git a/plugins/Quotes/src/Forex.cpp b/plugins/Quotes/src/Forex.cpp index be9da5bb35..4a93c23d63 100644 --- a/plugins/Quotes/src/Forex.cpp +++ b/plugins/Quotes/src/Forex.cpp @@ -48,13 +48,13 @@ namespace { CLISTMENUITEM mi = { sizeof(mi) }; mi.ptszName = LPGENT("Quotes"); - mi.flags = CMIF_TCHAR|CMIF_ICONFROMICOLIB|CMIF_ROOTPOPUP; + mi.flags = CMIF_TCHAR | CMIF_ROOTPOPUP; mi.icolibItem = Quotes_GetIconHandle(IDI_ICON_MAIN); HGENMENU hMenuRoot = Menu_AddMainMenuItem(&mi); g_ahMenus.push_back(hMenuRoot); mi.ptszName = LPGENT("Refresh All Quotes\\Rates"); - mi.flags = CMIF_TCHAR|CMIF_ICONFROMICOLIB|CMIF_ROOTHANDLE; + mi.flags = CMIF_TCHAR | CMIF_ROOTHANDLE; //mi.position = 0x0FFFFFFF; mi.icolibItem = Quotes_GetIconHandle(IDI_ICON_MAIN); mi.pszService = "Quotes/RefreshAll"; @@ -107,7 +107,7 @@ namespace { mi.pszPopupName=(char *)-1; mi.icolibItem = Quotes_GetIconHandle(IDI_ICON_MAIN); - mi.flags = CMIF_ICONFROMICOLIB|CMIF_TCHAR|CMIF_ROOTPOPUP; + mi.flags = CMIF_TCHAR | CMIF_ROOTPOPUP; tstring sProtocolName = quotes_a2t(QUOTES_PROTOCOL_NAME); mi.ptszName = const_cast(sProtocolName.c_str());//A2T(QUOTES_PROTOCOL_NAME); mi.position = 0; @@ -124,7 +124,6 @@ namespace mi.ptszName = LPGENT("Refresh"); mi.popupPosition = 0; - mi.flags |= CMIF_ICONFROMICOLIB; mi.icolibItem = Quotes_GetIconHandle(IDI_ICON_REFRESH); mi.pszService = "Quotes/RefreshContact"; hMenu = Menu_AddContactMenuItem(&mi); diff --git a/plugins/RecentContacts/src/RecentContacts.cpp b/plugins/RecentContacts/src/RecentContacts.cpp index 1d7574dfaa..0f66c5587a 100644 --- a/plugins/RecentContacts/src/RecentContacts.cpp +++ b/plugins/RecentContacts/src/RecentContacts.cpp @@ -442,7 +442,6 @@ int Create_TopToolbarShowList(WPARAM wParam, LPARAM lParam) int Create_MenuitemShowList(void) { CLISTMENUITEM mi = { sizeof(mi) }; - mi.flags = CMIF_ICONFROMICOLIB; mi.icolibItem = icon.hIcolib; mi.pszName = msLastUC_ShowListName; mi.pszService = msLastUC_ShowList; diff --git a/plugins/Restart/src/restart.cpp b/plugins/Restart/src/restart.cpp index 6b65c68550..bf61367c2c 100644 --- a/plugins/Restart/src/restart.cpp +++ b/plugins/Restart/src/restart.cpp @@ -48,9 +48,8 @@ extern "C" __declspec(dllexport) int Load(void) CLISTMENUITEM mi = { sizeof(mi) }; mi.position = -0x7FFFFFFF; - mi.flags = CMIF_ICONFROMICOLIB | CMIF_TCHAR; mi.icolibItem = icon.hIcolib; - mi.ptszName = LPGENT("Restart"); + mi.pszName = LPGEN("Restart"); mi.pszService = "System/RestartMe"; Menu_AddMainMenuItem(&mi); Menu_AddTrayMenuItem(&mi); diff --git a/plugins/Scriver/src/chat/main.cpp b/plugins/Scriver/src/chat/main.cpp index 56ca3965ef..23bc536582 100644 --- a/plugins/Scriver/src/chat/main.cpp +++ b/plugins/Scriver/src/chat/main.cpp @@ -76,14 +76,14 @@ int Chat_ModulesLoaded(WPARAM wParam,LPARAM lParam) CLISTMENUITEM mi = { sizeof(mi) }; mi.cbSize = sizeof(mi); mi.position = -2000090001; - mi.flags = CMIF_DEFAULT | CMIF_ICONFROMICOLIB; + mi.flags = CMIF_DEFAULT; mi.icolibItem = LoadSkinnedIconHandle( SKINICON_CHAT_JOIN ); mi.pszName = LPGEN("&Join"); mi.pszService = "GChat/JoinChat"; hJoinMenuItem = Menu_AddContactMenuItem(&mi); mi.position = -2000090000; - mi.flags = CMIF_NOTOFFLINE | CMIF_ICONFROMICOLIB; + mi.flags = CMIF_NOTOFFLINE; mi.icolibItem = LoadSkinnedIconHandle( SKINICON_CHAT_LEAVE ); mi.pszName = LPGEN("&Leave"); mi.pszService = "GChat/LeaveChat"; @@ -93,7 +93,6 @@ int Chat_ModulesLoaded(WPARAM wParam,LPARAM lParam) return 0; } - void LoadIcons(void) { LoadMsgLogBitmaps(); diff --git a/plugins/Scriver/src/msgs.cpp b/plugins/Scriver/src/msgs.cpp index 0f3eb1f6f2..6bda0dfb90 100644 --- a/plugins/Scriver/src/msgs.cpp +++ b/plugins/Scriver/src/msgs.cpp @@ -452,7 +452,7 @@ static int OnModulesLoaded(WPARAM wParam, LPARAM lParam) CLISTMENUITEM mi = { sizeof(mi) }; mi.position = -2000090000; - mi.flags = CMIF_ICONFROMICOLIB | CMIF_DEFAULT; + mi.flags = CMIF_DEFAULT; mi.icolibItem = LoadSkinnedIconHandle( SKINICON_EVENT_MESSAGE ); mi.pszName = LPGEN("&Message"); mi.pszService = MS_MSG_SENDMESSAGE; diff --git a/plugins/Sessions/Src/Main.cpp b/plugins/Sessions/Src/Main.cpp index 35276af9c3..7f2b2f4dbd 100644 --- a/plugins/Sessions/Src/Main.cpp +++ b/plugins/Sessions/Src/Main.cpp @@ -962,7 +962,7 @@ static int PluginInit(WPARAM wparam,LPARAM lparam) // Main menu CLISTMENUITEM cl = { sizeof(cl) }; cl.position = 1000000000; - cl.flags = CMIM_ALL | CMIF_TCHAR | CMIF_ICONFROMICOLIB; + cl.flags = CMIM_ALL | CMIF_TCHAR; cl.ptszName = LPGENT("Save session..."); cl.ptszPopupName = LPGENT("Sessions Manager"); diff --git a/plugins/SimpleStatusMsg/src/awaymsg.cpp b/plugins/SimpleStatusMsg/src/awaymsg.cpp index e286a13dbd..9a470fda94 100644 --- a/plugins/SimpleStatusMsg/src/awaymsg.cpp +++ b/plugins/SimpleStatusMsg/src/awaymsg.cpp @@ -455,7 +455,6 @@ int LoadAwayMsgModule(void) mi.pszService = MS_AWAYMSG_SHOWAWAYMSG; hAwayMsgMenuItem = Menu_AddContactMenuItem(&mi); - mi.flags |= CMIF_ICONFROMICOLIB; CreateServiceFunction(MS_SIMPLESTATUSMSG_COPYMSG, CopyAwayMsgCommand); mi.position = -2000006000; mi.icolibItem = GetIconHandle(IDI_COPY); diff --git a/plugins/SimpleStatusMsg/src/main.cpp b/plugins/SimpleStatusMsg/src/main.cpp index 92676a3b32..4aa0db4416 100644 --- a/plugins/SimpleStatusMsg/src/main.cpp +++ b/plugins/SimpleStatusMsg/src/main.cpp @@ -1646,7 +1646,7 @@ static int ChangeStatusMsgPrebuild(WPARAM wParam, LPARAM lParam) return 0; CLISTMENUITEM mi = { sizeof(mi) }; - mi.flags = CMIF_ICONFROMICOLIB | CMIF_TCHAR; + mi.flags = CMIF_TCHAR; if (!db_get_b(NULL, "SimpleStatusMsg", "ShowStatusMenuItem", 1)) mi.flags |= CMIF_HIDDEN; mi.icolibItem = GetIconHandle(IDI_CSMSG); diff --git a/plugins/SmileyAdd/src/main.cpp b/plugins/SmileyAdd/src/main.cpp index 795760164f..f8ee1407a1 100644 --- a/plugins/SmileyAdd/src/main.cpp +++ b/plugins/SmileyAdd/src/main.cpp @@ -58,7 +58,7 @@ static int ModulesLoaded(WPARAM, LPARAM) metaProtoName = mir_strdup(temp == CALLSERVICE_NOTFOUND ? NULL : (char*)temp); CLISTMENUITEM mi = { sizeof(mi) }; - mi.flags = CMIF_ROOTPOPUP | CMIF_ICONFROMICOLIB; + mi.flags = CMIF_ROOTPOPUP; mi.popupPosition = 2000070050; mi.position = 2000070050; mi.icolibItem = icon.hIcolib; diff --git a/plugins/TabSRMM/src/chat/services.cpp b/plugins/TabSRMM/src/chat/services.cpp index 59d4cd646f..3f5d199c0e 100644 --- a/plugins/TabSRMM/src/chat/services.cpp +++ b/plugins/TabSRMM/src/chat/services.cpp @@ -67,14 +67,14 @@ int Chat_ModulesLoaded(WPARAM wParam, LPARAM lParam) CLISTMENUITEM mi = { sizeof(mi) }; mi.position = -2000090001; - mi.flags = CMIF_DEFAULT | CMIF_ICONFROMICOLIB; + mi.flags = CMIF_DEFAULT; mi.icolibItem = LoadSkinnedIconHandle( SKINICON_CHAT_JOIN ); mi.pszName = LPGEN("&Join"); mi.pszService = "GChat/JoinChat"; hJoinMenuItem = Menu_AddContactMenuItem(&mi); mi.position = -2000090000; - mi.flags = CMIF_NOTOFFLINE | CMIF_ICONFROMICOLIB; + mi.flags = CMIF_NOTOFFLINE; mi.icolibItem = LoadSkinnedIconHandle( SKINICON_CHAT_LEAVE ); mi.pszName = LPGEN("&Leave"); mi.pszService = "GChat/LeaveChat"; diff --git a/plugins/TabSRMM/src/globals.cpp b/plugins/TabSRMM/src/globals.cpp index 38581de550..cb41598cc4 100644 --- a/plugins/TabSRMM/src/globals.cpp +++ b/plugins/TabSRMM/src/globals.cpp @@ -205,7 +205,7 @@ void CGlobals::reloadSystemModulesChanged() CLISTMENUITEM mi = { sizeof(mi) }; mi.position = -2000090000; - mi.flags = CMIF_ICONFROMICOLIB | CMIF_DEFAULT; + mi.flags = CMIF_DEFAULT; mi.icolibItem = LoadSkinnedIconHandle(SKINICON_EVENT_MESSAGE); mi.pszName = LPGEN("&Message"); mi.pszService = MS_MSG_SENDMESSAGE; diff --git a/plugins/Weather/src/weather_svcs.cpp b/plugins/Weather/src/weather_svcs.cpp index 0f074e292a..0185b78072 100644 --- a/plugins/Weather/src/weather_svcs.cpp +++ b/plugins/Weather/src/weather_svcs.cpp @@ -240,7 +240,7 @@ void UpdateMenu(BOOL State) opt.AutoUpdate = 0; } - mi.flags = CMIM_ICON | CMIM_NAME | CMIF_ICONFROMICOLIB; + mi.flags = CMIM_ICON | CMIM_NAME; Menu_ModifyItem(hEnableDisableMenu, &mi); CallService(MS_TTB_SETBUTTONSTATE, (WPARAM)hTBButton, !State ? TTBST_PUSHED : TTBST_RELEASED); @@ -264,7 +264,7 @@ void UpdatePopupMenu(BOOL State) mi.icolibItem = GetIconHandle("nopopup"); } - mi.flags = CMIM_ICON | CMIM_NAME | CMIF_ICONFROMICOLIB; + mi.flags = CMIM_ICON | CMIM_NAME; Menu_ModifyItem(hEnableDisablePopupMenu, &mi); } @@ -288,7 +288,6 @@ void AddMenuItems(void) { CLISTMENUITEM mi = { sizeof(mi) }; mi.pszContactOwner = WEATHERPROTONAME; - mi.flags = CMIF_ICONFROMICOLIB; // contact menu CreateServiceFunction(MS_WEATHER_UPDATE, UpdateSingleStation); diff --git a/plugins/WhenWasIt/src/hooked_events.cpp b/plugins/WhenWasIt/src/hooked_events.cpp index df5f28b418..c34865fbc6 100644 --- a/plugins/WhenWasIt/src/hooked_events.cpp +++ b/plugins/WhenWasIt/src/hooked_events.cpp @@ -86,7 +86,7 @@ int OnModulesLoaded(WPARAM wParam, LPARAM lParam) CLISTMENUITEM cl = { sizeof(cl) }; cl.position = 10000000; - cl.flags = CMIF_ICONFROMICOLIB|CMIF_TCHAR; + cl.flags = CMIF_TCHAR; cl.ptszPopupName = LPGENT("Birthdays (When Was It)"); cl.pszService = MS_WWI_CHECK_BIRTHDAYS; diff --git a/plugins/YAMN/src/main.cpp b/plugins/YAMN/src/main.cpp index ccb7598853..64b9642e64 100644 --- a/plugins/YAMN/src/main.cpp +++ b/plugins/YAMN/src/main.cpp @@ -196,7 +196,6 @@ int SystemModulesLoaded(WPARAM, LPARAM) //Insert "Check mail (YAMN)" item to Miranda's menu CLISTMENUITEM mi = { sizeof(mi) }; mi.position = 0xb0000000; - mi.flags = CMIF_ICONFROMICOLIB; mi.icolibItem = g_GetIconHandle(0); mi.pszName = LPGEN("Check &mail (All Account)"); mi.pszPopupName = NULL;//YAMN_DBMODULE; -- cgit v1.2.3