From 32dedc767dec565c576b78b786e7a95d76ac806e Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Mon, 19 Nov 2012 12:51:53 +0000
Subject: - added another helper, ExtraIcon_Clear, to remove an icon from slot;
 - added ability to pass IcoLib handles instead of icons' names

git-svn-id: http://svn.miranda-ng.org/main/trunk@2371 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 protocols/AimOscar/src/theme.cpp        |  8 ++++----
 protocols/IcqOscarJ/src/icq_xstatus.cpp |  2 +-
 protocols/MRA/src/Mra.h                 |  1 -
 protocols/MRA/src/Mra_svcs.cpp          | 16 +++-------------
 4 files changed, 8 insertions(+), 19 deletions(-)

(limited to 'protocols')

diff --git a/protocols/AimOscar/src/theme.cpp b/protocols/AimOscar/src/theme.cpp
index 9ba7307d0d..b0b3fd4ec5 100644
--- a/protocols/AimOscar/src/theme.cpp
+++ b/protocols/AimOscar/src/theme.cpp
@@ -161,12 +161,12 @@ static HANDLE extra_ES_icon_handle[2];
 
 static void clear_AT_icon(HANDLE hContact)
 {
-	ExtraIcon_SetIcon(hExtraAT, hContact, (char*)NULL);
+	ExtraIcon_Clear(hExtraAT, hContact);
 }
 
 static void clear_ES_icon(HANDLE hContact)
 {
-	ExtraIcon_SetIcon(hExtraES, hContact, (char*)NULL);
+	ExtraIcon_Clear(hExtraES, hContact);
 }
 
 static void set_AT_icon(CAimProto* ppro, HANDLE hContact)
@@ -180,7 +180,7 @@ static void set_AT_icon(CAimProto* ppro, HANDLE hContact)
 		mir_snprintf(name, sizeof(name), "AIM_%s", extra_AT_icon_name[i]);
 		ExtraIcon_SetIcon(hExtraAT, hContact, name);
 	}
-	else ExtraIcon_SetIcon(hExtraAT, hContact, (char*)NULL);
+	else ExtraIcon_Clear(hExtraAT, hContact);
 }
 
 static void set_ES_icon(CAimProto* ppro, HANDLE hContact)
@@ -194,7 +194,7 @@ static void set_ES_icon(CAimProto* ppro, HANDLE hContact)
 		mir_snprintf(name, sizeof(name), "AIM_%s", extra_ES_icon_name[i]);
 		ExtraIcon_SetIcon(hExtraES, hContact, name);
 	}
-	else ExtraIcon_SetIcon(hExtraES, hContact, (char*)NULL);
+	else ExtraIcon_Clear(hExtraES, hContact);
 }
 
 void set_contact_icon(CAimProto* ppro, HANDLE hContact)
diff --git a/protocols/IcqOscarJ/src/icq_xstatus.cpp b/protocols/IcqOscarJ/src/icq_xstatus.cpp
index 8c195aaa7f..ab612f30b3 100644
--- a/protocols/IcqOscarJ/src/icq_xstatus.cpp
+++ b/protocols/IcqOscarJ/src/icq_xstatus.cpp
@@ -183,7 +183,7 @@ void releaseXStatusIcon(int bStatus, UINT flags)
 void setContactExtraIcon(HANDLE hContact, int xstatus)
 {
 	if (xstatus <= 0)
-		ExtraIcon_SetIcon(hExtraXStatus, hContact, (char *) NULL);
+		ExtraIcon_Clear(hExtraXStatus, hContact);
 	else {
 		char szTemp[MAX_PATH];
 		null_snprintf(szTemp, sizeof(szTemp), "icq_xstatus%d", xstatus-1);
diff --git a/protocols/MRA/src/Mra.h b/protocols/MRA/src/Mra.h
index 2d6ee820a3..38d02d62c1 100644
--- a/protocols/MRA/src/Mra.h
+++ b/protocols/MRA/src/Mra.h
@@ -247,7 +247,6 @@ BOOL   IsEMailMR                       (LPSTR lpszEMail, size_t dwEMailSize);
 BOOL   GetEMailFromString              (LPSTR lpszBuff, size_t dwBuffSize, LPSTR *plpszEMail, size_t *pdwEMailSize);
 
 DWORD  CreateBlobFromContact           (HANDLE hContact, LPWSTR lpwszRequestReason, size_t dwRequestReasonSize, LPBYTE lpbBuff, size_t dwBuffSize, size_t *pdwBuffSizeRet);
-int    ExtraSetIcon                    (HANDLE hExtraIcon, HANDLE hContact, HANDLE hImage);
 size_t CopyNumber                      (LPCVOID lpcOutBuff, LPCVOID lpcBuff, size_t dwLen);
 BOOL   IsPhone                         (LPSTR lpszString, size_t dwStringSize);
 BOOL   IsContactPhone                  (HANDLE hContact, LPSTR lpszPhone, size_t dwPhoneSize);
diff --git a/protocols/MRA/src/Mra_svcs.cpp b/protocols/MRA/src/Mra_svcs.cpp
index bc84af7703..d61098201a 100644
--- a/protocols/MRA/src/Mra_svcs.cpp
+++ b/protocols/MRA/src/Mra_svcs.cpp
@@ -157,19 +157,9 @@ void CMraProto::SetExtraIcons(HANDLE hContact)
 		if (dwBlogStatusMsgSize) dwIconID = ADV_ICON_BLOGSTATUS;
 	}
 
-	if ( IsXStatusValid(dwXStatus) || dwXStatus == MRA_MIR_XSTATUS_UNKNOWN) {
-		char szSetting[40];
-		mir_snprintf(szSetting, SIZEOF(szSetting), "mra_xstatus%d", dwXStatus);
-		ExtraSetIcon(hExtraXstatusIcon, hContact, szSetting);
-	}
-	else ExtraSetIcon(hExtraXstatusIcon, hContact, NULL);
-	
-	if (dwIconID != -1) {
-		char szSetting[40];
-		mir_snprintf(szSetting, SIZEOF(szSetting), "MRA_%s", gdiExtraStatusIconsItems[dwIconID].lpszName);
-		ExtraSetIcon(hExtraInfo, hContact, szSetting);
-	}
-	else ExtraSetIcon(hExtraInfo, hContact, NULL);
+	ExtraIcon_SetIcon(hExtraXstatusIcon, hContact, 
+		(IsXStatusValid(dwXStatus) || dwXStatus == MRA_MIR_XSTATUS_UNKNOWN) ? hXStatusAdvancedStatusIcons[dwXStatus] : NULL);
+	ExtraIcon_SetIcon(hExtraInfo, hContact, (dwIconID != -1) ? gdiExtraStatusIconsItems[dwIconID].hIconHandle : NULL);
 }
 
 INT_PTR CMraProto::MraXStatusMenu(WPARAM wParam, LPARAM lParam, LPARAM param)
-- 
cgit v1.2.3