applied and modified GDI resource patch by Borkra

git-svn-id: https://server.scottellis.com.au/svn/mim_plugs@89 4f64403b-2f21-0410-a795-97e2b3489a10

1 files changed, 12 insertions, 17 deletions

diff --git a/metacontacts/meta_services.c b/metacontacts/meta_services.c
index d051937..db365de 100644
--- a/metacontacts/meta_services.c
+++ b/metacontacts/meta_services.c
@@ -102,6 +102,10 @@ int Meta_GetCaps(WPARAM wParam,LPARAM lParam)
             //ret = PF4_FORCEAUTH;

 			ret = PF4_SUPPORTTYPING | PF4_AVATARS;

             break;

+        case PFLAGNUM_5:

+	            ret =	PF2_ONLINE | PF2_INVISIBLE | PF2_SHORTAWAY | PF2_LONGAWAY | PF2_LIGHTDND

+						| PF2_HEAVYDND | PF2_FREECHAT | PF2_OUTTOLUNCH | PF2_ONTHEPHONE;

+            break;

         case PFLAG_UNIQUEIDTEXT:

             ret = (int) Translate("Meta ID");

             break;

@@ -441,6 +445,7 @@ int MetaFilter_RecvMessage(WPARAM wParam,LPARAM lParam)
 			_snprintf(toolTip, sizeof(toolTip), Translate("Message from %s"), contactName);

 			cle.pszTooltip = toolTip;

 			CallService(MS_CLIST_ADDEVENT, 0, (LPARAM) & cle);

+			CallService(MS_SKIN2_RELEASEICON, (WPARAM)cle.hIcon, 0);

 		}

 

 		if(options.metahistory) {

@@ -1204,7 +1209,7 @@ int Meta_ClistMessageEventClicked(WPARAM wParam, LPARAM lParam) {
 */

 int Meta_ModulesLoaded(WPARAM wParam, LPARAM lParam)

 {

-	CLISTMENUITEM menu;

+	CLISTMENUITEM menu = {0};

 	char buffer[512], buffer2[512], buffer3[512];

 	int i;

 

@@ -1260,14 +1265,9 @@ int Meta_ModulesLoaded(WPARAM wParam, LPARAM lParam)
 	// (BUT, the me_clist_extra_list_rebuild is send FIRST...so, we ignore this one...)

 	hHooks[15] = 0;//(HANDLE)HookEvent(ME_SKIN_ICONSCHANGED, Meta_LoadIcons);

 

-	InitIcons();

-

-	ZeroMemory(&menu,sizeof(menu));

 	menu.cbSize=sizeof(menu);

 	menu.flags = CMIM_ALL;

 

-	menu.hIcon=hIconToggleOff;

-

 	// main menu item

 	menu.pszName = (char *)Translate("Toggle MetaContacts Off");

 	menu.pszService="MetaContacts/OnOff";

@@ -1277,28 +1277,23 @@ int Meta_ModulesLoaded(WPARAM wParam, LPARAM lParam)
 	// contact menu items

 	menu.position = -200010;

 	menu.pszName = (char *)Translate("Convert to MetaContact");

-	menu.hIcon=hIconConvert;

 	menu.pszService="MetaContacts/Convert";

 	hMenuConvert = (HANDLE)CallService(MS_CLIST_ADDCONTACTMENUITEM,0,(LPARAM)&menu);

 	menu.position = -200009;

 	menu.pszName = (char *)Translate("Add to existing MetaContact...");

-	menu.hIcon=hIconAdd;

 	menu.pszService="MetaContacts/AddTo";

 	hMenuAdd = (HANDLE)CallService(MS_CLIST_ADDCONTACTMENUITEM,0,(LPARAM)&menu);

 

 	menu.position = -200010;

 	menu.pszName = (char *)Translate("Edit MetaContact...");

-	menu.hIcon=hIconEdit;

 	menu.pszService="MetaContacts/Edit";

 	hMenuEdit = (HANDLE)CallService(MS_CLIST_ADDCONTACTMENUITEM,0,(LPARAM)&menu);

 	menu.position = -200009;

 	menu.pszName = (char *)Translate("Set as MetaContact default");

-	menu.hIcon=hIconDefault;

 	menu.pszService="MetaContacts/Default";

 	hMenuDefault = (HANDLE)CallService(MS_CLIST_ADDCONTACTMENUITEM,0,(LPARAM)&menu);

 	menu.position = -200008;

 	menu.pszName = (char *)Translate("Delete MetaContact");

-	menu.hIcon=hIconRemove;

 	menu.pszService="MetaContacts/Delete";

 	hMenuDelete = (HANDLE)CallService(MS_CLIST_ADDCONTACTMENUITEM,0,(LPARAM)&menu);

 	//menu.pszName = (char *)Translate("Force Default");

@@ -1341,16 +1336,15 @@ int Meta_ModulesLoaded(WPARAM wParam, LPARAM lParam)
 

 	Meta_HideLinkedContacts();

 	

+	InitIcons();

+

 	if(!Meta_IsEnabled())

 	{

-

 		// modify main menu item

-		menu.flags = CMIM_NAME | CMIM_ICON;

-		menu.hIcon=hIconToggleOn;

+		menu.flags = CMIM_NAME;

 		menu.pszName = (char *)Translate("Toggle MetaContacts On");

 		CallService(MS_CLIST_MODIFYMENUITEM, (WPARAM)hMenuOnOff, (LPARAM)&menu);

 

-

 		Meta_HideMetaContacts(TRUE);

 	} else {

 		Meta_SuppressStatus(options.suppress_status);

@@ -1829,17 +1823,18 @@ int Meta_OnOff(WPARAM wParam, LPARAM lParam) {
 		DBWriteContactSettingByte(0, META_PROTO, "Enabled", 0);

 		// modify main menu item

 		menu.flags = CMIM_NAME | CMIM_ICON;

-		menu.hIcon=hIconToggleOn;

+		menu.hIcon = LoadIconEx(I_MENU);

 		menu.pszName = (char *)Translate("Toggle MetaContacts On");

 		CallService(MS_CLIST_MODIFYMENUITEM, (WPARAM)hMenuOnOff, (LPARAM)&menu);

 	} else {

 		DBWriteContactSettingByte(0, META_PROTO, "Enabled", 1);

 		// modify main menu item

 		menu.flags = CMIM_NAME | CMIM_ICON;

-		menu.hIcon=hIconToggleOff;

+		menu.hIcon = LoadIconEx(I_MENUOFF);

 		menu.pszName = (char *)Translate("Toggle MetaContacts Off");

 		CallService(MS_CLIST_MODIFYMENUITEM, (WPARAM)hMenuOnOff, (LPARAM)&menu);

 	}

+	ReleaseIconEx(menu.hIcon);

 

 	return 0;

 }