From 6640a8f419a9ef61ad7af41a419615c2d07b872e Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
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/Gadu-Gadu/src/gg.cpp        | 8 ++++----
 protocols/Gadu-Gadu/src/groupchat.cpp | 2 +-
 protocols/Gadu-Gadu/src/image.cpp     | 2 +-
 protocols/Gadu-Gadu/src/import.cpp    | 2 +-
 protocols/Gadu-Gadu/src/links.cpp     | 1 -
 protocols/Gadu-Gadu/src/sessions.cpp  | 2 +-
 6 files changed, 8 insertions(+), 9 deletions(-)

(limited to 'protocols/Gadu-Gadu')

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;
-- 
cgit v1.2.3