From bd8a04455d9c991c15df2287e091abe4ba054efb Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Sun, 25 Nov 2012 12:54:45 +0000
Subject: typed stub for MS_PROTO_GETCONTACTBASEPROTO

git-svn-id: http://svn.miranda-ng.org/main/trunk@2480 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 plugins/SecureIM/src/crypt_metacontacts.cpp | 2 +-
 plugins/SecureIM/src/crypt_misc.cpp         | 2 +-
 plugins/SecureIM/src/dbevent.cpp            | 2 +-
 plugins/SecureIM/src/svcs_clist.cpp         | 2 +-
 plugins/SecureIM/src/svcs_proto.cpp         | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'plugins/SecureIM/src')

diff --git a/plugins/SecureIM/src/crypt_metacontacts.cpp b/plugins/SecureIM/src/crypt_metacontacts.cpp
index f36c7e4dd3..065ad5145d 100644
--- a/plugins/SecureIM/src/crypt_metacontacts.cpp
+++ b/plugins/SecureIM/src/crypt_metacontacts.cpp
@@ -3,7 +3,7 @@
 
 BOOL isProtoMetaContacts(HANDLE hContact) {
     if(bMetaContacts) {
-    	LPSTR proto = (LPSTR)CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM)hContact, 0);
+    	LPSTR proto = GetContactProto(hContact);
     	if ( proto && strcmp(proto,"MetaContacts")==0 ) {
     		return true;
     	}
diff --git a/plugins/SecureIM/src/crypt_misc.cpp b/plugins/SecureIM/src/crypt_misc.cpp
index 7e0055913d..fb65f29798 100644
--- a/plugins/SecureIM/src/crypt_misc.cpp
+++ b/plugins/SecureIM/src/crypt_misc.cpp
@@ -5,7 +5,7 @@ int SendBroadcast( HANDLE hContact, int type, int result, HANDLE hProcess, LPARA
 	ACKDATA ack;
 	memset(&ack,0,sizeof(ack));
 	ack.cbSize = sizeof( ACKDATA );
-	ack.szModule = 	(char*)CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM)hContact, 0);
+	ack.szModule = 	GetContactProto(hContact);
 	ack.hContact = hContact;
 	ack.type = type;
 	ack.result = result;
diff --git a/plugins/SecureIM/src/dbevent.cpp b/plugins/SecureIM/src/dbevent.cpp
index 7b26631502..6f5f1bc80b 100644
--- a/plugins/SecureIM/src/dbevent.cpp
+++ b/plugins/SecureIM/src/dbevent.cpp
@@ -7,7 +7,7 @@ void HistoryLog(HANDLE hContact, LPCSTR szText) {
 	memset(&dbei, 0, sizeof(dbei));
 
 	dbei.cbSize = sizeof(dbei);
-	dbei.szModule = (char *)CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM)hContact, 0);
+	dbei.szModule = GetContactProto(hContact);
 	dbei.flags = DBEF_SENT|DBEF_READ;
 	dbei.timestamp = time(NULL);
 	dbei.eventType = EVENTTYPE_MESSAGE;
diff --git a/plugins/SecureIM/src/svcs_clist.cpp b/plugins/SecureIM/src/svcs_clist.cpp
index 45299d8611..e7aa7f8379 100644
--- a/plugins/SecureIM/src/svcs_clist.cpp
+++ b/plugins/SecureIM/src/svcs_clist.cpp
@@ -120,7 +120,7 @@ int __cdecl onRebuildContactMenu(WPARAM wParam,LPARAM lParam) {
 		return 0;
 	}
 
-//	char *szProto = (char*)CallService(MS_PROTO_GETCONTACTBASEPROTO,(WPARAM)hContact,0);
+//	char *szProto = GetContactProto(hContact,0);
 //	if (szProto==NULL) // || DBGetContactSettingDword(hContact, szProto, "Status", ID_STATUS_OFFLINE) == ID_STATUS_OFFLINE)
 //		return 0;
 
diff --git a/plugins/SecureIM/src/svcs_proto.cpp b/plugins/SecureIM/src/svcs_proto.cpp
index 8d2aade148..eb5466c329 100644
--- a/plugins/SecureIM/src/svcs_proto.cpp
+++ b/plugins/SecureIM/src/svcs_proto.cpp
@@ -890,7 +890,7 @@ INT_PTR __cdecl onSendMsg(WPARAM wParam, LPARAM lParam) {
     		DBEVENTINFO dbei; HANDLE hC = getMostOnline(pccsd->hContact);
 		ZeroMemory(&dbei, sizeof(dbei));
 		dbei.cbSize = sizeof(dbei);
-		dbei.szModule = (char *)CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM)hC, 0);
+		dbei.szModule = GetContactProto(hC, 0);
 		dbei.flags = DBEF_SENT;
 		dbei.timestamp = time(NULL);
 		dbei.eventType = EVENTTYPE_MESSAGE;
-- 
cgit v1.2.3