diff options
| author | George Hazan <george.hazan@gmail.com> | 2013-04-06 23:05:29 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2013-04-06 23:05:29 +0000 |
| commit | 6640a8f419a9ef61ad7af41a419615c2d07b872e (patch) | |
| tree | 6dfecb48ccc82c0c372ced9be59255c7408ebafd /protocols/MSN | |
| parent | 06823b967ab360de98fa2c9e685695e1dff6f78a (diff) | |
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
Diffstat (limited to 'protocols/MSN')
| -rw-r--r-- | protocols/MSN/src/msn_menu.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/protocols/MSN/src/msn_menu.cpp b/protocols/MSN/src/msn_menu.cpp index 24038dfad1..a42aa7016e 100644 --- a/protocols/MSN/src/msn_menu.cpp +++ b/protocols/MSN/src/msn_menu.cpp @@ -292,7 +292,7 @@ void CMsnProto::MsnInitMainMenu(void) if (hRoot == NULL) {
mi.popupPosition = 500085000;
mi.hParentMenu = HGENMENU_ROOT;
- mi.flags = CMIF_ICONFROMICOLIB | CMIF_ROOTPOPUP | CMIF_TCHAR | CMIF_KEEPUNTRANSLATED;
+ mi.flags = CMIF_ROOTPOPUP | CMIF_TCHAR | CMIF_KEEPUNTRANSLATED;
mi.icolibItem = GetIconHandle(IDI_MSN);
mi.ptszName = m_tszUserName;
hRoot = mainMenuRoot = Menu_AddProtoMenuItem(&mi);
@@ -302,7 +302,7 @@ void CMsnProto::MsnInitMainMenu(void) mainMenuRoot = NULL;
}
- mi.flags = CMIF_ICONFROMICOLIB | CMIF_CHILDPOPUP;
+ mi.flags = CMIF_CHILDPOPUP;
mi.hParentMenu = hRoot;
mi.pszService = servicefunction;
@@ -427,7 +427,6 @@ void MSN_InitContactMenu(void) char* tDest = servicefunction + strlen(servicefunction);
CLISTMENUITEM mi = { sizeof(mi) };
- mi.flags = CMIF_ICONFROMICOLIB;
mi.pszService = servicefunction;
strcpy(tDest, MSN_BLOCK);
@@ -446,7 +445,7 @@ void MSN_InitContactMenu(void) strcpy(tDest, MSN_NETMEETING);
hNetMeeting = CreateServiceFunction(servicefunction, MsnMenuSendNetMeeting);
- mi.flags = CMIF_ICONFROMICOLIB | CMIF_NOTOFFLINE;
+ mi.flags = CMIF_NOTOFFLINE;
mi.position = -500050002;
mi.icolibItem = GetIconHandle(IDI_NETMEETING);
mi.pszName = LPGEN("&Start Netmeeting");
@@ -455,7 +454,7 @@ void MSN_InitContactMenu(void) strcpy(tDest, "/SendHotmail");
hSendHotMail = CreateServiceFunction(servicefunction, MsnMenuSendHotmail);
mi.position = -2000010005;
- mi.flags = CMIF_ICONFROMICOLIB | CMIF_HIDDEN;
+ mi.flags = CMIF_HIDDEN;
mi.icolibItem = LoadSkinnedIconHandle(SKINICON_OTHER_SENDEMAIL);
mi.pszName = LPGEN("Open &Hotmail Inbox");
hOpenInboxMenuItem = Menu_AddContactMenuItem(&mi);
|