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 --- protocols/AimOscar/src/theme.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'protocols/AimOscar') diff --git a/protocols/AimOscar/src/theme.cpp b/protocols/AimOscar/src/theme.cpp index c32409f5b2..b5c0ae20a7 100644 --- a/protocols/AimOscar/src/theme.cpp +++ b/protocols/AimOscar/src/theme.cpp @@ -270,7 +270,7 @@ void CAimProto::InitMainMenus(void) HGENMENU hRoot = MO_GetProtoRootMenu(m_szModuleName); if (hRoot == NULL) { - mi.flags = CMIF_ROOTPOPUP | CMIF_ICONFROMICOLIB | CMIF_TCHAR | CMIF_KEEPUNTRANSLATED; + mi.flags = CMIF_ROOTPOPUP | CMIF_TCHAR | CMIF_KEEPUNTRANSLATED; mi.icolibItem = GetIconHandle("aim"); mi.ptszName = m_tszUserName; mi.hParentMenu = HGENMENU_ROOT; @@ -285,7 +285,7 @@ void CAimProto::InitMainMenus(void) mi.pszService = service_name; mi.hParentMenu = hRoot; - mi.flags = CMIF_ICONFROMICOLIB | CMIF_CHILDPOPUP; + mi.flags = CMIF_CHILDPOPUP; mir_snprintf(service_name, sizeof(service_name), "%s%s", m_szModuleName, "/ManageAccount"); CreateProtoService("/ManageAccount", &CAimProto::ManageAccount); @@ -323,7 +323,7 @@ void CAimProto::InitContactMenus(void) mi.position = -2000006000; mi.icolibItem = GetIconHandle("away"); mi.pszName = LPGEN("Read &HTML Away Message"); - mi.flags = CMIF_NOTOFFLINE | CMIF_HIDDEN | CMIF_ICONFROMICOLIB; + mi.flags = CMIF_NOTOFFLINE | CMIF_HIDDEN; hHTMLAwayContextMenuItem = Menu_AddContactMenuItem(&mi); mir_snprintf(service_name, sizeof(service_name), "%s%s", m_szModuleName, "/GetProfile"); @@ -331,7 +331,7 @@ void CAimProto::InitContactMenus(void) mi.position = -2000005090; mi.icolibItem = GetIconHandle("profile"); mi.pszName = LPGEN("Read Profile"); - mi.flags = CMIF_NOTOFFLINE | CMIF_ICONFROMICOLIB; + mi.flags = CMIF_NOTOFFLINE; hReadProfileMenuItem = Menu_AddContactMenuItem(&mi); mir_snprintf(service_name, sizeof(service_name), "%s%s", m_szModuleName, "/AddToServerList"); @@ -339,7 +339,7 @@ void CAimProto::InitContactMenus(void) mi.position = -2000005080; mi.icolibItem = GetIconHandle("add"); mi.pszName = LPGEN("Add To Server List"); - mi.flags = CMIF_NOTONLINE | CMIF_HIDDEN | CMIF_ICONFROMICOLIB; + mi.flags = CMIF_NOTONLINE | CMIF_HIDDEN; hAddToServerListContextMenuItem = Menu_AddContactMenuItem(&mi); mir_snprintf(service_name, sizeof(service_name), "%s%s", m_szModuleName, "/BlockCommand"); @@ -347,7 +347,7 @@ void CAimProto::InitContactMenus(void) mi.position = -2000005060; mi.icolibItem = GetIconHandle("block"); mi.pszName = LPGEN("&Block"); - mi.flags = CMIF_ICONFROMICOLIB | CMIF_HIDDEN; + mi.flags = CMIF_HIDDEN; hBlockContextMenuItem = Menu_AddContactMenuItem(&mi); } -- cgit v1.2.3