From 75b1ff75c42644eb36552762652e4b0c9ff071bc Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Fri, 2 Nov 2012 14:11:01 +0000
Subject: final switch to the typed icolib api

git-svn-id: http://svn.miranda-ng.org/main/trunk@2152 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 protocols/FacebookRM/src/process.cpp | 2 +-
 protocols/FacebookRM/src/proto.cpp   | 2 +-
 protocols/FacebookRM/src/theme.cpp   | 3 +--
 3 files changed, 3 insertions(+), 4 deletions(-)

(limited to 'protocols/FacebookRM/src')

diff --git a/protocols/FacebookRM/src/process.cpp b/protocols/FacebookRM/src/process.cpp
index 0acff0f36f..f5d04fc343 100644
--- a/protocols/FacebookRM/src/process.cpp
+++ b/protocols/FacebookRM/src/process.cpp
@@ -608,7 +608,7 @@ void FacebookProto::ProcessFriendRequests( void* )
 				*pCurBlob = '\0'; pCurBlob++;                                        // E-mail
 				*pCurBlob = '\0';                                                    // Reason
 
-				CallService(MS_DB_EVENT_ADD, (WPARAM)NULL, (LPARAM)&dbei);				
+				CallService(MS_DB_EVENT_ADD, 0, (LPARAM)&dbei);				
 
 				LOG("      (New) Friendship request from: %s (%s) [%s]", fbu->real_name.c_str(), fbu->user_id.c_str(), time.c_str());
 			} else {
diff --git a/protocols/FacebookRM/src/proto.cpp b/protocols/FacebookRM/src/proto.cpp
index c2d7a39151..f0b9b7af90 100644
--- a/protocols/FacebookRM/src/proto.cpp
+++ b/protocols/FacebookRM/src/proto.cpp
@@ -145,7 +145,7 @@ HICON FacebookProto::GetIcon(int index)
 {
 	if (LOWORD(index) == PLI_PROTOCOL)
 	{
-		HICON ico = (HICON)CallService(MS_SKIN2_GETICON,0,(LPARAM)"Facebook_facebook");
+		HICON ico = Skin_GetIcon("Facebook_facebook");
 		return CopyIcon(ico);
 	} else {
 		return 0;
diff --git a/protocols/FacebookRM/src/theme.cpp b/protocols/FacebookRM/src/theme.cpp
index 1fdbeace0b..128eb72759 100644
--- a/protocols/FacebookRM/src/theme.cpp
+++ b/protocols/FacebookRM/src/theme.cpp
@@ -82,8 +82,7 @@ void InitIcons(void)
 			sid.iDefaultIndex = -icons[i].defIconID;
 			hIconLibItem[i] = Skin_AddIcon(&sid);
 		} else { // External icons
-			hIconLibItem[i] = (HANDLE)CallService(MS_SKIN2_GETICONHANDLE,0,
-				(LPARAM)icons[i].section);
+			hIconLibItem[i] = Skin_GetIconHandle(icons[i].section);
 		}
 	}	
 }
-- 
cgit v1.2.3