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

2 files changed, 9 insertions, 19 deletions

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

 

-

 	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;