final switch to the typed icolib api

git-svn-id: http://svn.miranda-ng.org/main/trunk@2152 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

3 files changed, 8 insertions, 17 deletions

diff --git a/plugins/New_GPG/src/icons.cpp b/plugins/New_GPG/src/icons.cpp
index 3f89da2e53..ec307666d1 100755
--- a/plugins/New_GPG/src/icons.cpp
+++ b/plugins/New_GPG/src/icons.cpp
@@ -44,8 +44,8 @@ HANDLE IconLibDefine(TCHAR* desc, TCHAR* section, char* ident, HICON icon, char*
 void InitIconLib()

 {

 	extern HINSTANCE hInst;

-    char lib[MAX_PATH];

-    GetModuleFileNameA(hInst, lib, MAX_PATH);

+	char lib[MAX_PATH];

+	GetModuleFileNameA(hInst, lib, MAX_PATH);

 	TCHAR *module = mir_a2t(szGPGModuleName);

 

 	IconLibDefine(_T("Secured"), module, "secured", NULL, lib, -IDI_SECURED,0);

@@ -53,30 +53,21 @@ void InitIconLib()
 	mir_free(module);

 }

 

-

-

-

-

 HICON IconLibGetIcon(const char* ident)

 {

-  return (HICON)CallService(MS_SKIN2_GETICON, 0, (LPARAM)ident);

+	return Skin_GetIcon(ident);

 }

 

-

-

 void IconLibReleaseIcon(const char* ident)

 {

-  CallService(MS_SKIN2_RELEASEICON, 0, (LPARAM)ident);

+	Skin_ReleaseIcon(ident);

 }

 

-

-

 HANDLE IconLibHookIconsChanged(MIRANDAHOOK hook)

 {

-  return HookEvent(ME_SKIN2_ICONSCHANGED, hook);

+	return HookEvent(ME_SKIN2_ICONSCHANGED, hook);

 }

 

-

 void setClistIcon(HANDLE hContact)

 {

 	bool enabled = isContactSecured(hContact);

@@ -91,7 +82,7 @@ void setClistIcon(HANDLE hContact)
 		HICON icon = IconLibGetIcon("secured");

 		IconExtraColumn iec = {0};

 		iec.cbSize = sizeof(iec);

-		iec.hImage = (HANDLE)CallService(MS_CLIST_EXTRA_ADD_ICON, (WPARAM)icon, (LPARAM)0);

+		iec.hImage = (HANDLE)CallService(MS_CLIST_EXTRA_ADD_ICON, (WPARAM)icon, 0);

 		ExtraIcon_SetIcon(g_hCLIcon, hContact, iec.hImage);

 		if(hMC)

 			ExtraIcon_SetIcon(g_hCLIcon, hMC, iec.hImage);

diff --git a/plugins/New_GPG/src/messages.cpp b/plugins/New_GPG/src/messages.cpp
index 7eb598cc16..abc1a624ec 100755
--- a/plugins/New_GPG/src/messages.cpp
+++ b/plugins/New_GPG/src/messages.cpp
@@ -610,7 +610,7 @@ int RecvMsgSvc(WPARAM w, LPARAM l)
 							mir_free(caps);
 							if(str.find(_T("GPG_Key_Auto_Exchange:0")) != string::npos)
 							{
-								CallContactService(ccs->hContact, PSS_MESSAGE, (WPARAM)0, (LPARAM)"-----PGP KEY REQUEST-----");
+								CallContactService(ccs->hContact, PSS_MESSAGE, 0, (LPARAM)"-----PGP KEY REQUEST-----");
 								return 0;
 							}
 						}
diff --git a/plugins/New_GPG/src/utilities.cpp b/plugins/New_GPG/src/utilities.cpp
index 8a503249ec..f0a8e7a387 100755
--- a/plugins/New_GPG/src/utilities.cpp
+++ b/plugins/New_GPG/src/utilities.cpp
@@ -1299,7 +1299,7 @@ bool isTabsrmmUsed()
 	enm.lParam = (LPARAM)&found;
 	enm.pfnEnumProc = (DBSETTINGENUMPROC)&handleEnum;
 	enm.szModule = "PluginDisable";
-	if(CallService(MS_DB_CONTACT_ENUMSETTINGS, (WPARAM)NULL, (LPARAM)&enm) == -1)
+	if(CallService(MS_DB_CONTACT_ENUMSETTINGS, 0, (LPARAM)&enm) == -1)
 		return false;
 
 	return found;