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/BasicHistory/src/EventList.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'plugins/BasicHistory/src/EventList.cpp')

diff --git a/plugins/BasicHistory/src/EventList.cpp b/plugins/BasicHistory/src/EventList.cpp
index e6bf5ef0d3..930f8827bc 100644
--- a/plugins/BasicHistory/src/EventList.cpp
+++ b/plugins/BasicHistory/src/EventList.cpp
@@ -507,7 +507,7 @@ std::wstring EventList::GetMyName()
 	CONTACTINFO ci;
 	ZeroMemory(&ci, sizeof(ci));
 	ci.cbSize = sizeof(ci);
-	ci.szProto = (char *)CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM)hContact, 0);
+	ci.szProto = GetContactProto(hContact);
 	ci.hContact = 0;
 	ci.dwFlag = CNF_DISPLAY | CNF_TCHAR;
 	GetInfo(ci, myName);
@@ -544,7 +544,7 @@ std::wstring EventList::GetProtocolName()
 
 std::string EventList::GetBaseProtocol()
 {
-	char* proto = (char *)CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM)hContact, 0);
+	char* proto = GetContactProto(hContact);
 	return proto == NULL ? "" : proto;
 }
 
@@ -554,7 +554,7 @@ std::wstring EventList::GetMyId()
 	CONTACTINFO ci;
 	ZeroMemory(&ci, sizeof(ci));
 	ci.cbSize = sizeof(ci);
-	ci.szProto = (char *)CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM)hContact, 0);
+	ci.szProto = GetContactProto(hContact);
 	ci.hContact = 0;
 	ci.dwFlag = CNF_DISPLAYUID | CNF_TCHAR;
 	GetInfo(ci, myId);
@@ -567,7 +567,7 @@ inline std::wstring GetContactId(HANDLE hContact)
 	CONTACTINFO ci;
 	ZeroMemory(&ci, sizeof(ci));
 	ci.cbSize = sizeof(ci);
-	ci.szProto = (char *)CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM)hContact, 0);
+	ci.szProto = GetContactProto(hContact);
 	ci.hContact = hContact;
 	ci.dwFlag = CNF_DISPLAYUID | CNF_TCHAR;
 	GetInfo(ci, id);
@@ -723,7 +723,7 @@ void EventList::MargeMessages(const std::vector<IImport::ExternalMessage>& messa
 	GetTempList(tempList, true, false, hContact);
 	DBEVENTINFO dbei = {0};
 	dbei.cbSize = sizeof(DBEVENTINFO);
-	dbei.szModule = (char *)CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM)hContact, 0);
+	dbei.szModule = GetContactProto(hContact);
 	CallService(MS_DB_SETSAFETYMODE, (WPARAM)FALSE, 0);
 	for(std::list<EventTempIndex>::iterator it = tempList.begin(); it != tempList.end(); ++it)
 	{
-- 
cgit v1.2.3