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

21 files changed, 49 insertions, 63 deletions

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);

 }

 

diff --git a/protocols/FacebookRM/src/theme.cpp b/protocols/FacebookRM/src/theme.cpp
index e7dff88aba..c43cc7666e 100644
--- a/protocols/FacebookRM/src/theme.cpp
+++ b/protocols/FacebookRM/src/theme.cpp
@@ -100,8 +100,6 @@ void InitContactMenus()
 	HookEvent(ME_CLIST_PREBUILDCONTACTMENU,PrebuildContactMenu);

 

 	CLISTMENUITEM mi = {sizeof(mi)};

-	mi.flags = CMIF_ICONFROMICOLIB;

-

 	mi.position=-2000006000;

 	mi.icolibItem = GetIconHandle("homepage");

 	mi.pszName = GetIconDescription("homepage");

@@ -178,7 +176,7 @@ int FacebookProto::OnBuildStatusMenu(WPARAM wParam,LPARAM lParam)
 	if (hRoot == NULL) {

 		mi.popupPosition = 500085000;

 		mi.hParentMenu = HGENMENU_ROOT;

-		mi.flags = CMIF_ICONFROMICOLIB | CMIF_ROOTPOPUP | CMIF_TCHAR | CMIF_KEEPUNTRANSLATED | ( this->isOnline() ? 0 : CMIF_GRAYED );

+		mi.flags = CMIF_ROOTPOPUP | CMIF_TCHAR | CMIF_KEEPUNTRANSLATED | ( this->isOnline() ? 0 : CMIF_GRAYED );

 		mi.icolibItem = GetIconHandle( "facebook" );

 		mi.ptszName = m_tszUserName;

 		hRoot = m_hMenuRoot = Menu_AddProtoMenuItem(&mi);

@@ -188,7 +186,7 @@ int FacebookProto::OnBuildStatusMenu(WPARAM wParam,LPARAM lParam)
 		m_hMenuRoot = NULL;

 	}

 

-	mi.flags = CMIF_ICONFROMICOLIB | CMIF_CHILDPOPUP | ( this->isOnline() ? 0 : CMIF_GRAYED );

+	mi.flags = CMIF_CHILDPOPUP | ( this->isOnline() ? 0 : CMIF_GRAYED );

 	mi.position = 201001;

 

 	CreateProtoService(m_szModuleName,"/Mind",&FacebookProto::OnMind,this);

@@ -200,7 +198,7 @@ int FacebookProto::OnBuildStatusMenu(WPARAM wParam,LPARAM lParam)
 

 	CreateProtoService(m_szModuleName,"/VisitProfile",&FacebookProto::VisitProfile,this);

 	strcpy(tDest,"/VisitProfile");

-	mi.flags = CMIF_ICONFROMICOLIB | CMIF_CHILDPOPUP;

+	mi.flags = CMIF_CHILDPOPUP;

 	mi.pszName = LPGEN("Visit Profile");

 	mi.icolibItem = GetIconHandle("homepage");

 	// TODO RM: remember and properly free in destructor?

@@ -209,13 +207,13 @@ int FacebookProto::OnBuildStatusMenu(WPARAM wParam,LPARAM lParam)
 	// Services...

 	mi.pszName = LPGEN("Services...");

 	strcpy( tDest, "/Services" );

-	mi.flags = CMIF_ICONFROMICOLIB | CMIF_CHILDPOPUP | ( this->isOnline() ? 0 : CMIF_GRAYED );

+	mi.flags = CMIF_CHILDPOPUP | ( this->isOnline() ? 0 : CMIF_GRAYED );

 	mi.icolibItem = NULL;

 	m_hMenuServicesRoot = Menu_AddProtoMenuItem(&mi);

 

 	CreateProtoService(m_szModuleName,"/RefreshBuddyList",&FacebookProto::RefreshBuddyList,this);

 	strcpy(tDest,"/RefreshBuddyList");

-	mi.flags = CMIF_ICONFROMICOLIB | CMIF_ROOTHANDLE;

+	mi.flags = CMIF_ROOTHANDLE;

 	mi.pszName = LPGEN("Refresh Buddy List");

 	mi.pszPopupName = LPGEN("Services");

 	mi.icolibItem = NULL;

@@ -224,7 +222,7 @@ int FacebookProto::OnBuildStatusMenu(WPARAM wParam,LPARAM lParam)
 

 	CreateProtoService(m_szModuleName,"/CheckFriendRequests",&FacebookProto::CheckFriendRequests,this);

 	strcpy(tDest,"/CheckFriendRequests");

-	mi.flags = CMIF_ICONFROMICOLIB | CMIF_ROOTHANDLE;

+	mi.flags = CMIF_ROOTHANDLE;

 	mi.pszName = LPGEN("Check Friends Requests");

 	mi.icolibItem = NULL;

 	mi.hParentMenu = m_hMenuServicesRoot;

@@ -232,7 +230,7 @@ int FacebookProto::OnBuildStatusMenu(WPARAM wParam,LPARAM lParam)
 

 	CreateProtoService(m_szModuleName,"/CheckNewsfeeds",&FacebookProto::CheckNewsfeeds,this);

 	strcpy(tDest,"/CheckNewsfeeds");

-	mi.flags = CMIF_ICONFROMICOLIB | CMIF_ROOTHANDLE;

+	mi.flags = CMIF_ROOTHANDLE;

 	mi.pszName = LPGEN("Check Newsfeeds");

 	mi.pszPopupName = LPGEN("Services");

 	mi.icolibItem = NULL;

diff --git a/protocols/Gadu-Gadu/src/gg.cpp b/protocols/Gadu-Gadu/src/gg.cpp
index 548aaecce0..74ba0ef628 100644
--- a/protocols/Gadu-Gadu/src/gg.cpp
+++ b/protocols/Gadu-Gadu/src/gg.cpp
@@ -237,7 +237,7 @@ static int gg_prebuildcontactmenu(WPARAM wParam, LPARAM lParam)
 		return 0;

 

 	CLISTMENUITEM mi = { sizeof(mi) };

-	mi.flags = CMIM_NAME | CMIM_FLAGS | CMIF_ICONFROMICOLIB | CMIF_TCHAR;

+	mi.flags = CMIM_NAME | CMIM_FLAGS | CMIF_TCHAR;

 	if ( db_get_dw(hContact, gg->m_szModuleName, GG_KEY_UIN, 0) == db_get_b(NULL, gg->m_szModuleName, GG_KEY_UIN, 0)

 			|| db_get_b(hContact, gg->m_szModuleName, "ChatRoom", 0)

 			|| db_get_b(hContact, "CList", "NotOnList", 0))

@@ -269,7 +269,7 @@ void GGPROTO::block_init()
 	createObjService(service, &GGPROTO::blockuser);

 

 	CLISTMENUITEM mi = { sizeof(mi) };

-	mi.flags = CMIF_ICONFROMICOLIB | CMIF_TCHAR;

+	mi.flags = CMIF_TCHAR;

 	mi.position = -500050000;

 	mi.icolibItem = iconList[8].hIcolib;

 	mi.ptszName = LPGENT("&Block");

@@ -299,13 +299,13 @@ void GGPROTO::menus_init()
 		mi.ptszName = m_tszUserName;

 		mi.position = 500090000;

 		mi.hParentMenu = HGENMENU_ROOT;

-		mi.flags = CMIF_ICONFROMICOLIB | CMIF_ROOTPOPUP | CMIF_TCHAR | CMIF_KEEPUNTRANSLATED;

+		mi.flags = CMIF_ROOTPOPUP | CMIF_TCHAR | CMIF_KEEPUNTRANSLATED;

 		mi.icolibItem = iconList[0].hIcolib;

 		hGCRoot = hCLRoot = hRoot = hMenuRoot = Menu_AddProtoMenuItem(&mi);

 	}

 	else {

 		mi.hParentMenu = hRoot;

-		mi.flags = CMIF_ICONFROMICOLIB | CMIF_ROOTHANDLE | CMIF_TCHAR;

+		mi.flags = CMIF_ROOTHANDLE | CMIF_TCHAR;

 

 		mi.ptszName = LPGENT("Conference");

 		mi.position = 200001;

diff --git a/protocols/Gadu-Gadu/src/groupchat.cpp b/protocols/Gadu-Gadu/src/groupchat.cpp
index ff8e0bfccd..1f19e0c25c 100644
--- a/protocols/Gadu-Gadu/src/groupchat.cpp
+++ b/protocols/Gadu-Gadu/src/groupchat.cpp
@@ -65,7 +65,7 @@ void GGPROTO::gc_menus_init(HGENMENU hRoot)
 		char service[64];

 

 		CLISTMENUITEM mi = { sizeof(mi) };

-		mi.flags = CMIF_ICONFROMICOLIB | CMIF_ROOTHANDLE | CMIF_TCHAR;

+		mi.flags = CMIF_ROOTHANDLE | CMIF_TCHAR;

 		mi.hParentMenu = hRoot;

 

 		// Conferencing

diff --git a/protocols/Gadu-Gadu/src/image.cpp b/protocols/Gadu-Gadu/src/image.cpp
index da9104004b..52e915c845 100644
--- a/protocols/Gadu-Gadu/src/image.cpp
+++ b/protocols/Gadu-Gadu/src/image.cpp
@@ -74,7 +74,7 @@ int GGPROTO::img_init()
 

 	// Send image contact menu item

 	CLISTMENUITEM mi = { sizeof(mi) };

-	mi.flags = CMIF_ICONFROMICOLIB | CMIF_TCHAR;

+	mi.flags = CMIF_TCHAR;

 	mi.position = -2000010000;

 	mi.icolibItem = iconList[11].hIcolib;

 	mi.ptszName = LPGENT("&Image");

diff --git a/protocols/Gadu-Gadu/src/import.cpp b/protocols/Gadu-Gadu/src/import.cpp
index 0cbded18f8..abaa9799f6 100644
--- a/protocols/Gadu-Gadu/src/import.cpp
+++ b/protocols/Gadu-Gadu/src/import.cpp
@@ -621,7 +621,7 @@ void GGPROTO::import_init(HGENMENU hRoot)
 	createObjService(service, &GGPROTO::import_server);

 

 	CLISTMENUITEM mi = { sizeof(mi) };

-	mi.flags = CMIF_ICONFROMICOLIB | CMIF_ROOTHANDLE | CMIF_TCHAR;

+	mi.flags = CMIF_ROOTHANDLE | CMIF_TCHAR;

 	mi.hParentMenu = hRoot;

 	mi.position = 2000500001;

 	mi.icolibItem = iconList[1].hIcolib;

diff --git a/protocols/Gadu-Gadu/src/links.cpp b/protocols/Gadu-Gadu/src/links.cpp
index 0da199062d..8b78eb73dc 100644
--- a/protocols/Gadu-Gadu/src/links.cpp
+++ b/protocols/Gadu-Gadu/src/links.cpp
@@ -125,7 +125,6 @@ void gg_links_instancemenu_init()
 	hInstanceMenu = (HANDLE)CallService(MO_CREATENEWMENUOBJECT, 0, (LPARAM)&mnu);

 

 	tmi.cbSize = sizeof(tmi);

-	tmi.flags = CMIF_ICONFROMICOLIB;

 	tmi.pszName = "Cancel";

 	tmi.position = 9999999;

 	tmi.hIcolibItem = LoadSkinnedIconHandle(SKINICON_OTHER_DELETE);

diff --git a/protocols/Gadu-Gadu/src/sessions.cpp b/protocols/Gadu-Gadu/src/sessions.cpp
index 764c4113d9..04836b80d4 100644
--- a/protocols/Gadu-Gadu/src/sessions.cpp
+++ b/protocols/Gadu-Gadu/src/sessions.cpp
@@ -430,7 +430,7 @@ void GGPROTO::sessions_menus_init(HGENMENU hRoot)
 	createObjService(service, &GGPROTO::sessions_view);

 

 	CLISTMENUITEM mi = { sizeof(mi) };

-	mi.flags = CMIF_ICONFROMICOLIB | CMIF_ROOTHANDLE | CMIF_TCHAR;

+	mi.flags = CMIF_ROOTHANDLE | CMIF_TCHAR;

 	mi.hParentMenu = hRoot;

 	mi.position = (hMenuRoot) ? 2050000001 : 200003;

 	mi.icolibItem = iconList[16].hIcolib;

diff --git a/protocols/IRCG/src/services.cpp b/protocols/IRCG/src/services.cpp
index 31706f1858..8135f9fa36 100644
--- a/protocols/IRCG/src/services.cpp
+++ b/protocols/IRCG/src/services.cpp
@@ -38,7 +38,7 @@ void CIrcProto::InitMainMenus(void)
 			mi.ptszName = m_tszUserName;

 			mi.position = -1999901010;

 			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_MAIN);

 			hRoot = hMenuRoot = Menu_AddProtoMenuItem(&mi);

 		}

@@ -48,7 +48,7 @@ void CIrcProto::InitMainMenus(void)
 			hMenuRoot = NULL;

 		}

 

-		mi.flags = CMIF_ICONFROMICOLIB | CMIF_CHILDPOPUP;

+		mi.flags = CMIF_CHILDPOPUP;

 		mi.pszName = LPGEN("&Quick connect");

 		mi.icolibItem = GetIconHandle(IDI_QUICK);

 		strcpy( d, IRC_QUICKCONNECT );

@@ -145,7 +145,6 @@ void InitContactMenus(void)
 

 	CLISTMENUITEM mi = { sizeof(mi) };

 	mi.pszService = temp;

-	mi.flags = CMIF_ICONFROMICOLIB;

 

 	mi.pszName = LPGEN("Channel &settings");

 	mi.icolibItem = GetIconHandle(IDI_MANAGER);

diff --git a/protocols/IcqOscarJ/src/icq_menu.cpp b/protocols/IcqOscarJ/src/icq_menu.cpp
index a62b1da5f7..b5ced1e725 100644
--- a/protocols/IcqOscarJ/src/icq_menu.cpp
+++ b/protocols/IcqOscarJ/src/icq_menu.cpp
@@ -115,7 +115,6 @@ void g_MenuInit(void)
 

 	CLISTMENUITEM mi = { sizeof(mi) };

 	mi.pszService = str;

-	mi.flags = CMIF_ICONFROMICOLIB;

 

 	// "Request authorization"

 	strcpy(pszDest, MS_REQ_AUTH); CreateServiceFunction(str, IcqMenuHandleRequestAuth );

diff --git a/protocols/IcqOscarJ/src/icq_xstatus.cpp b/protocols/IcqOscarJ/src/icq_xstatus.cpp
index b8b7a2d056..4453ab2884 100644
--- a/protocols/IcqOscarJ/src/icq_xstatus.cpp
+++ b/protocols/IcqOscarJ/src/icq_xstatus.cpp
@@ -873,7 +873,7 @@ void CIcqProto::InitXStatusItems(BOOL bAllowStatus)
 		if (!bXStatusMenuBuilt)

 			CreateProtoServiceParam(srvFce+len, &CIcqProto::menuXStatus, i);

 

-		mi.flags = (i ? CMIF_ICONFROMICOLIB : 0) | (bXStatus == i?CMIF_CHECKED:0);

+		mi.flags = (bXStatus == i ? CMIF_CHECKED : 0);

 		mi.icolibItem = i ? hXStatusIcons[i-1] : NULL;

 		mi.pszName = i ? (char*)nameXStatus[i-1] : (char *)LPGEN("None");

 		mi.pszService = srvFce;

diff --git a/protocols/JabberG/src/jabber_menu.cpp b/protocols/JabberG/src/jabber_menu.cpp
index c0348c53a3..2d7bbe11e9 100644
--- a/protocols/JabberG/src/jabber_menu.cpp
+++ b/protocols/JabberG/src/jabber_menu.cpp
@@ -193,7 +193,6 @@ void g_MenuInit(void)
 	hChooserMenu = (HANDLE)CallService(MO_CREATENEWMENUOBJECT, 0, (LPARAM)&mnu);

 

 	TMO_MenuItem tmi = { sizeof(tmi) };

-	tmi.flags = CMIF_ICONFROMICOLIB;

 	tmi.pszName = "Cancel";

 	tmi.position = 9999999;

 	tmi.hIcolibItem = LoadSkinnedIconHandle(SKINICON_OTHER_DELETE);

@@ -206,7 +205,6 @@ void g_MenuInit(void)
 

 	// "Request authorization"

 	mi.pszName = LPGEN("Request authorization");

-	mi.flags = CMIF_ICONFROMICOLIB;

 	mi.position = -2000001000;

 	mi.icolibItem = g_GetIconHandle(IDI_REQUEST);

 	mi.pszService = "Jabber/ReqAuth";

@@ -294,10 +292,7 @@ void g_MenuInit(void)
 	g_hMenuDirectPresence[0] = Menu_AddContactMenuItem(&mi);

 

 	mi.flags |= CMIF_ROOTHANDLE;

-	mi.flags &= ~CMIF_ICONFROMICOLIB;

-

-	for (int i = 0; i < SIZEOF(PresenceModeArray); i++)

-	{

+	for (int i = 0; i < SIZEOF(PresenceModeArray); i++) {

 		char buf[] = "Jabber/DirectPresenceX";

 		buf[SIZEOF(buf)-2] = '0' + i;

 		mi.pszService = buf;

@@ -310,7 +305,6 @@ void g_MenuInit(void)
 	}

 

 	mi.flags &= ~CMIF_ROOTHANDLE;

-	mi.flags |= CMIF_ICONFROMICOLIB;

 

 	// Resource selector

 	mi.pszService = "Jabber/ResourceSelectorDummySvc";

@@ -477,10 +471,10 @@ int CJabberProto::OnPrebuildContactMenu(WPARAM wParam, LPARAM)
 					else Menu_ShowItem(m_phMenuResourceItems[i], FALSE);

 				}

 

-				mi.flags = CMIM_FLAGS | CMIF_CHILDPOPUP | CMIF_ICONFROMICOLIB | ((item->resourceMode == RSMODE_LASTSEEN) ? CMIF_CHECKED : 0);

+				mi.flags = CMIM_FLAGS | CMIF_CHILDPOPUP | ((item->resourceMode == RSMODE_LASTSEEN) ? CMIF_CHECKED : 0);

 				Menu_ModifyItem(g_hMenuResourcesActive, &mi);

 

-				mi.flags = CMIM_FLAGS | CMIF_CHILDPOPUP | CMIF_ICONFROMICOLIB | ((item->resourceMode == RSMODE_SERVER) ? CMIF_CHECKED : 0);

+				mi.flags = CMIM_FLAGS | CMIF_CHILDPOPUP | ((item->resourceMode == RSMODE_SERVER) ? CMIF_CHECKED : 0);

 				Menu_ModifyItem(g_hMenuResourcesServer, &mi);

 

 				m_nMenuResourceItems = nMenuResourceItemsNew;

@@ -676,7 +670,7 @@ void CJabberProto::MenuInit()
 		mi.ptszName = m_tszUserName;

 		mi.position = -1999901006;

 		mi.hParentMenu = HGENMENU_ROOT;

-		mi.flags = CMIF_ICONFROMICOLIB | CMIF_ROOTPOPUP | CMIF_TCHAR | CMIF_KEEPUNTRANSLATED;

+		mi.flags = CMIF_ROOTPOPUP | CMIF_TCHAR | CMIF_KEEPUNTRANSLATED;

 		mi.icolibItem = m_hProtoIcon;

 		hJabberRoot = m_hMenuRoot = Menu_AddProtoMenuItem(&mi);

 	}

@@ -689,7 +683,7 @@ void CJabberProto::MenuInit()
 	// "Bookmarks..."

 	JCreateService("/Bookmarks", &CJabberProto::OnMenuHandleBookmarks);

 	strcpy(tDest, "/Bookmarks");

-	mi.flags = CMIF_ICONFROMICOLIB | CMIF_CHILDPOPUP;

+	mi.flags = CMIF_CHILDPOPUP;

 	mi.hParentMenu = hJabberRoot;

 	mi.pszName = LPGEN("Bookmarks");

 	mi.position = 200001;

@@ -714,7 +708,7 @@ void CJabberProto::MenuInit()
 	// "Service Discovery..."

 	JCreateService("/ServiceDiscovery", &CJabberProto::OnMenuHandleServiceDiscovery);

 	strcpy(tDest, "/ServiceDiscovery");

-	mi.flags = CMIF_ICONFROMICOLIB | CMIF_ROOTHANDLE;

+	mi.flags = CMIF_ROOTHANDLE;

 	mi.pszName = LPGEN("Service Discovery");

 	mi.position = 2000050001;

 	mi.icolibItem = GetIconHandle(IDI_SERVICE_DISCOVERY);

@@ -801,7 +795,7 @@ void CJabberProto::MenuInit()
 	mi.pszService = srvFce;

 	mi.pszName = szName;

 	mi.position = 2000040000;

-	mi.flags = CMIF_CHILDPOPUP | CMIF_ICONFROMICOLIB;

+	mi.flags = CMIF_CHILDPOPUP;

 	mi.hParentMenu = m_hMenuPriorityRoot;

 

 	mir_snprintf(srvFce, sizeof(srvFce), "%s/menuSetPriority/0", m_szModuleName);

diff --git a/protocols/JabberG/src/jabber_privacy.cpp b/protocols/JabberG/src/jabber_privacy.cpp
index 04289ee5d8..e0c5f041f2 100644
--- a/protocols/JabberG/src/jabber_privacy.cpp
+++ b/protocols/JabberG/src/jabber_privacy.cpp
@@ -2242,7 +2242,7 @@ void CJabberProto::BuildPrivacyMenu()
 	mi.position = 200005;

 	mi.pszContactOwner = m_szModuleName;

 	mi.icolibItem = GetIconHandle(IDI_AGENTS);

-	mi.flags = CMIF_ROOTPOPUP | CMIF_CHILDPOPUP | CMIF_ICONFROMICOLIB | CMIF_HIDDEN;

+	mi.flags = CMIF_ROOTPOPUP | CMIF_CHILDPOPUP | CMIF_HIDDEN;

 	mi.pszName = LPGEN("Privacy Lists");

 	mi.hParentMenu = MO_GetProtoRootMenu(m_szModuleName);

 	m_hPrivacyMenuRoot = Menu_AddProtoMenuItem(&mi);

@@ -2252,7 +2252,7 @@ void CJabberProto::BuildPrivacyMenu()
 	mir_snprintf(srvFce, SIZEOF(srvFce), "%s/PrivacyLists", m_szModuleName);

 	mi.pszService = srvFce;

 	mi.position = 3000040000;

-	mi.flags = CMIF_CHILDPOPUP | CMIF_TCHAR | CMIF_ICONFROMICOLIB;

+	mi.flags = CMIF_CHILDPOPUP | CMIF_TCHAR;

 	mi.icolibItem = GetIconHandle(IDI_PRIVACY_LISTS);

 	mi.ptszName = LPGENT("List Editor...");

 	mi.hParentMenu = m_hPrivacyMenuRoot;

@@ -2274,7 +2274,7 @@ void CJabberProto::BuildPrivacyListsMenu(bool bDeleteOld)
 

 	CLISTMENUITEM mi = { sizeof(mi) };

 	mi.position = 2000040000;

-	mi.flags = CMIF_CHILDPOPUP | CMIF_ICONFROMICOLIB | CMIF_TCHAR;

+	mi.flags = CMIF_CHILDPOPUP | CMIF_TCHAR;

 	mi.hParentMenu = m_hPrivacyMenuRoot;

 	mi.pszService = srvFce;

 

diff --git a/protocols/JabberG/src/jabber_xstatus.cpp b/protocols/JabberG/src/jabber_xstatus.cpp
index 306527b920..05f4dc05d1 100644
--- a/protocols/JabberG/src/jabber_xstatus.cpp
+++ b/protocols/JabberG/src/jabber_xstatus.cpp
@@ -480,7 +480,7 @@ void CPepGuiService::RebuildMenu()
 	mi.hParentMenu = hJabberRoot;

 	mi.pszService = szService;

 	mi.position = 200010;

-	mi.flags = CMIF_TCHAR | CMIF_ICONFROMICOLIB | CMIF_HIDDEN | CMIF_ROOTHANDLE;

+	mi.flags = CMIF_TCHAR | CMIF_HIDDEN | CMIF_ROOTHANDLE;

 	mi.icolibItem = m_hIcolibItem;

 	mi.ptszName = m_szText ? m_szText : _T("<advanced status slot>");

 	m_hMenuItem = Menu_AddProtoMenuItem(&mi);

@@ -506,7 +506,7 @@ void CPepGuiService::UpdateMenuItem(HANDLE hIcolibIcon, TCHAR *text)
 	if ( !m_hMenuItem) return;

 

 	CLISTMENUITEM mi = { sizeof(mi) };

-	mi.flags = CMIF_TCHAR | CMIF_ICONFROMICOLIB | CMIM_ICON | CMIM_NAME;

+	mi.flags = CMIF_TCHAR | CMIM_ICON | CMIM_NAME;

 	mi.icolibItem = m_hIcolibItem;

 	mi.ptszName = m_szText ? m_szText : _T("<advanced status slot>");

 	Menu_ModifyItem(m_hMenuItem, &mi);

diff --git a/protocols/MRA/src/MraIcons.cpp b/protocols/MRA/src/MraIcons.cpp
index 2165803c22..f82ba302c7 100644
--- a/protocols/MRA/src/MraIcons.cpp
+++ b/protocols/MRA/src/MraIcons.cpp
@@ -177,12 +177,12 @@ void CMraProto::CListCreateMenu(LONG lPosition, LONG lPopupPosition, HICON hMain
 			hRootMenu = Menu_AddProtoMenuItem(&mi);

 		}

 		mi.hParentMenu = hRootMenu;

-		mi.flags = CMIF_UNICODE | CMIF_ICONFROMICOLIB | CMIF_CHILDPOPUP;

+		mi.flags = CMIF_UNICODE | CMIF_CHILDPOPUP;

 	}

 	else {

 		fnAddFunc = Menu_AddContactMenuItem;

 		mi.ptszPopupName = m_tszUserName;

-		mi.flags = CMIF_UNICODE | CMIF_ICONFROMICOLIB;

+		mi.flags = CMIF_UNICODE;

 	}

 

 	mi.popupPosition = lPopupPosition;

diff --git a/protocols/MRA/src/Mra_svcs.cpp b/protocols/MRA/src/Mra_svcs.cpp
index 4c5ebe50c0..600331cff5 100644
--- a/protocols/MRA/src/Mra_svcs.cpp
+++ b/protocols/MRA/src/Mra_svcs.cpp
@@ -659,7 +659,7 @@ int CMraProto::MraRebuildStatusMenu(WPARAM wParam, LPARAM lParam)
 	mi.position = 2000060000;

 	mi.popupPosition = 500085000;

 	mi.ptszPopupName = szItem;

-	mi.flags = (CMIF_UNICODE|CMIF_ICONFROMICOLIB);

+	mi.flags = CMIF_UNICODE;

 	mi.pszService = szServiceFunction;

 	mi.pszContactOwner = m_szModuleName;

 

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);

diff --git a/protocols/Tlen/src/tlen.cpp b/protocols/Tlen/src/tlen.cpp
index de5c844120..34e03d3071 100644
--- a/protocols/Tlen/src/tlen.cpp
+++ b/protocols/Tlen/src/tlen.cpp
@@ -303,11 +303,11 @@ static void initMenuItems(TlenProtocol *proto)
 	mi.ptszName = proto->m_tszUserName;

 	mi.position = -1999901009;

 	mi.pszPopupName = (char *)-1;

-	mi.flags = CMIF_ROOTPOPUP | CMIF_TCHAR | CMIF_ICONFROMICOLIB;

+	mi.flags = CMIF_ROOTPOPUP | CMIF_TCHAR;

 	mi.icolibItem = GetIconHandle(IDI_TLEN);

 	proto->hMenuRoot = Menu_AddMainMenuItem(&mi);

 

-	mi.flags = CMIF_CHILDPOPUP | CMIF_ICONFROMICOLIB;

+	mi.flags = CMIF_CHILDPOPUP;

 	//mi.pszPopupName = (char *)proto->hMenuRoot;

 	mi.hParentMenu = (HGENMENU)proto->hMenuRoot;

 

@@ -347,7 +347,6 @@ static void initMenuItems(TlenProtocol *proto)
 	// "Send picture"

 	sprintf(text, "%s/SendPicture", proto->m_szModuleName);

 	CreateServiceFunction_Ex(text, proto, TlenContactMenuHandleSendPicture);

-	mi.flags = CMIF_ICONFROMICOLIB;

 	mi.pszName = LPGEN("Send picture");

 	mi.position = -2000019030;

 	mi.icolibItem = GetIconHandle(IDI_IMAGE);

diff --git a/protocols/Twitter/src/proto.cpp b/protocols/Twitter/src/proto.cpp
index e1af8a6f83..71d200b0cf 100644
--- a/protocols/Twitter/src/proto.cpp
+++ b/protocols/Twitter/src/proto.cpp
@@ -297,7 +297,7 @@ int TwitterProto::OnBuildStatusMenu(WPARAM,LPARAM)
 	mi.pszService = text;

 

 	mi.hParentMenu = hRoot;

-	mi.flags = CMIF_ICONFROMICOLIB|CMIF_ROOTHANDLE|CMIF_TCHAR;

+	mi.flags = CMIF_ROOTHANDLE | CMIF_TCHAR;

 	mi.position = 1001;

 

 	HANDLE m_hMenuRoot = Menu_AddStatusMenuItem(&mi);

diff --git a/protocols/Twitter/src/theme.cpp b/protocols/Twitter/src/theme.cpp
index 7c55bfaa98..b3f886722a 100644
--- a/protocols/Twitter/src/theme.cpp
+++ b/protocols/Twitter/src/theme.cpp
@@ -85,7 +85,7 @@ void InitContactMenus()
 	g_hMenuEvts[0] = HookEvent(ME_CLIST_PREBUILDCONTACTMENU,PrebuildContactMenu);

 

 	CLISTMENUITEM mi = {sizeof(mi)};

-	mi.flags = CMIF_NOTOFFLINE | CMIF_ICONFROMICOLIB | CMIF_TCHAR;

+	mi.flags = CMIF_NOTOFFLINE | CMIF_TCHAR;

 

 	mi.position=-2000006000;

 	mi.icolibItem = GetIconHandle("reply");

diff --git a/protocols/Yahoo/src/services.cpp b/protocols/Yahoo/src/services.cpp
index 1ad0249b06..c375f29330 100644
--- a/protocols/Yahoo/src/services.cpp
+++ b/protocols/Yahoo/src/services.cpp
@@ -385,7 +385,7 @@ void CYahooProto::MenuMainInit( void )
 	if ( hRoot == NULL) {

 		mi.position = 500015000;

 		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_YAHOO );

 		mi.ptszName = m_tszUserName;

 		hRoot = mainMenuRoot = Menu_AddProtoMenuItem(&mi);

@@ -396,7 +396,7 @@ void CYahooProto::MenuMainInit( void )
 		mainMenuRoot = NULL;

 	}

 		

-	mi.flags = CMIF_ICONFROMICOLIB | CMIF_CHILDPOPUP;

+	mi.flags = CMIF_CHILDPOPUP;

 	mi.hParentMenu = hRoot;

 	

 	// Show custom status menu    

@@ -480,7 +480,6 @@ void CYahooProto::MenuContactInit( void )
 	char* tDest = servicefunction + lstrlenA( servicefunction );

 	

 	CLISTMENUITEM mi = { sizeof(mi) };

-	mi.flags = CMIF_ICONFROMICOLIB;

 	mi.pszService = servicefunction;

 	mi.pszContactOwner = m_szModuleName;