final switch to the typed icolib api

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

5 files changed, 7 insertions, 7 deletions

diff --git a/plugins/NewXstatusNotify/src/indsnd.cpp b/plugins/NewXstatusNotify/src/indsnd.cpp
index 3c27a6bb6e..b3841fa4c0 100644
--- a/plugins/NewXstatusNotify/src/indsnd.cpp
+++ b/plugins/NewXstatusNotify/src/indsnd.cpp
@@ -346,7 +346,7 @@ int UserInfoInitialise(WPARAM wParam, LPARAM lParam)
 

 void ResetListOptions(HWND hwndList) 

 {

-	SendMessage(hwndList, CLM_SETBKBITMAP, 0, (LPARAM)NULL);

+	SendMessage(hwndList, CLM_SETBKBITMAP, 0, 0);

 	SendMessage(hwndList, CLM_SETBKCOLOR, GetSysColor(COLOR_WINDOW), 0);

 	SendMessage(hwndList, CLM_SETGREYOUTFLAGS, 0, 0);

 	SendMessage(hwndList, CLM_SETLEFTMARGIN, 4, 0);

diff --git a/plugins/NewXstatusNotify/src/main.cpp b/plugins/NewXstatusNotify/src/main.cpp
index a75b04472d..ff58ca697f 100644
--- a/plugins/NewXstatusNotify/src/main.cpp
+++ b/plugins/NewXstatusNotify/src/main.cpp
@@ -89,7 +89,7 @@ HANDLE GetIconHandle(char *szIcon)
 {

 	char szSettingName[64];

 	mir_snprintf(szSettingName, sizeof(szSettingName), "%s_%s", MODULE, szIcon);

-	return (HANDLE)CallService(MS_SKIN2_GETICONHANDLE, 0, (LPARAM)szSettingName);

+	return Skin_GetIconHandle(szSettingName);

 }

 

 bool IsNewExtraStatus(HANDLE hContact, char *szSetting, TCHAR *newStatusTitle)

@@ -633,7 +633,7 @@ int StatusModeChanged(WPARAM wParam, LPARAM lParam)
 void ShowStatusChangePopup(HANDLE hContact, char *szProto, WORD oldStatus, WORD newStatus)

 {

 	TCHAR stzStatusText[MAX_SECONDLINE] = {0};

-	WORD myStatus = (WORD)CallProtoService(szProto, PS_GETSTATUS, (WPARAM)0, (LPARAM)0);

+	WORD myStatus = (WORD)CallProtoService(szProto, PS_GETSTATUS, 0, 0);

 

 	POPUPDATAT ppd = {0};

 	ppd.lchContact = hContact;

@@ -781,7 +781,7 @@ int ContactStatusChanged(WPARAM wParam, LPARAM lParam)
 		return 0;

 

 	strcpy(szProto, hlpProto);

-	WORD myStatus = (WORD)CallProtoService(szProto, PS_GETSTATUS, (WPARAM)0, (LPARAM)0);

+	WORD myStatus = (WORD)CallProtoService(szProto, PS_GETSTATUS, 0, 0);

 

 	if (strcmp(szProto, szMetaModuleName) == 0) { //this contact is Meta

 		HANDLE hSubContact = (HANDLE)CallService(MS_MC_GETMOSTONLINECONTACT, (WPARAM)hContact, 0);

diff --git a/plugins/NewXstatusNotify/src/options.cpp b/plugins/NewXstatusNotify/src/options.cpp
index 6fb0de5458..360261f8f9 100644
--- a/plugins/NewXstatusNotify/src/options.cpp
+++ b/plugins/NewXstatusNotify/src/options.cpp
@@ -389,7 +389,7 @@ INT_PTR CALLBACK DlgProcPopUpOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM
 							WORD status = i <= ID_STATUS_MAX2 ? i : ID_STATUS_MIN;

 							ppd.lchIcon = LoadSkinnedIcon(StatusList[Index(status)].icon);

 

-							_tcscpy(ppd.lptzContactName, (TCHAR *)CallService(MS_CLIST_GETCONTACTDISPLAYNAME, (WPARAM)NULL, GSMDF_TCHAR));

+							_tcscpy(ppd.lptzContactName, (TCHAR *)CallService(MS_CLIST_GETCONTACTDISPLAYNAME, 0, GSMDF_TCHAR));

 							_tcscpy(ppd.lptzText, _T(""));

 

 							if (opt.ShowStatus)

diff --git a/plugins/NewXstatusNotify/src/utils.cpp b/plugins/NewXstatusNotify/src/utils.cpp
index ee8dbbc150..b7362ae1a5 100644
--- a/plugins/NewXstatusNotify/src/utils.cpp
+++ b/plugins/NewXstatusNotify/src/utils.cpp
@@ -83,7 +83,7 @@ int ProtoServiceExists(const char *szModule, const char *szService)
 BOOL StatusHasAwayMessage(char *szProto, int status) 

 {

 	if (szProto != NULL) {

-		unsigned long iSupportsSM = (unsigned long)CallProtoService(szProto, PS_GETCAPS, (WPARAM)PFLAGNUM_3, (LPARAM)0);

+		unsigned long iSupportsSM = (unsigned long)CallProtoService(szProto, PS_GETCAPS, (WPARAM)PFLAGNUM_3, 0);

 		return (iSupportsSM & Proto_Status2Flag(status)) ? TRUE : FALSE;

 	}

 

diff --git a/plugins/NewXstatusNotify/src/xstatus.cpp b/plugins/NewXstatusNotify/src/xstatus.cpp
index d99456abe9..f80caba2f1 100644
--- a/plugins/NewXstatusNotify/src/xstatus.cpp
+++ b/plugins/NewXstatusNotify/src/xstatus.cpp
@@ -143,7 +143,7 @@ void ShowPopup(XSTATUSCHANGE *xsc)
 	case TYPE_JABBER_ACTIVITY:

 		mir_snprintf(szSetting, SIZEOF(szSetting), "%s/%s/%s", xsc->szProto, (xsc->type == TYPE_JABBER_MOOD) ? "mood" : "activity", "icon");

 		if (!DBGetContactSettingString(xsc->hContact, "AdvStatus", szSetting, &dbv)) {

-			ppd.lchIcon = (HICON)CallService(MS_SKIN2_GETICON, 0, (LPARAM)dbv.pszVal);

+			ppd.lchIcon = Skin_GetIcon(dbv.pszVal);

 			DBFreeVariant(&dbv);

 		}

 		break;