From 45a5b1f9b7709f8d93b57abea7ba46b44eac5707 Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Thu, 10 Oct 2013 15:13:20 +0000
Subject: - MS_CLIST_GETSTATUSMODEDESCRIPTION replaced with the direct clist
 call - crazy & obsolete constant GSMDF_PREFIXONLINE removed

git-svn-id: http://svn.miranda-ng.org/main/trunk@6428 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 protocols/Yahoo/src/main.cpp     | 2 ++
 protocols/Yahoo/src/proto.cpp    | 4 ++--
 protocols/Yahoo/src/services.cpp | 6 +++---
 3 files changed, 7 insertions(+), 5 deletions(-)

(limited to 'protocols/Yahoo')

diff --git a/protocols/Yahoo/src/main.cpp b/protocols/Yahoo/src/main.cpp
index e7f96840f9..07e8a80b28 100644
--- a/protocols/Yahoo/src/main.cpp
+++ b/protocols/Yahoo/src/main.cpp
@@ -24,6 +24,7 @@ HINSTANCE hInstance;
 
 HANDLE g_hNetlibUser;
 
+CLIST_INTERFACE *pcli;
 int hLangpack;
 
 PLUGININFOEX pluginInfo={
@@ -96,6 +97,7 @@ static int yahooProtoUninit( CYahooProto* ppro )
 extern "C" int __declspec(dllexport)Load(void)
 {
 	mir_getLP( &pluginInfo );
+	mir_getCLI();
 	
 	PROTOCOLDESCRIPTOR pd = { sizeof(pd) };
 	pd.szName = "YAHOO";
diff --git a/protocols/Yahoo/src/proto.cpp b/protocols/Yahoo/src/proto.cpp
index 4769e91e22..22dfba71f1 100644
--- a/protocols/Yahoo/src/proto.cpp
+++ b/protocols/Yahoo/src/proto.cpp
@@ -420,7 +420,7 @@ int __cdecl CYahooProto::SetApparentMode( HANDLE hContact, int mode )
 
 int __cdecl CYahooProto::SetStatus( int iNewStatus )
 {
-	LOG(("[SetStatus] New status %s", (char *) CallService(MS_CLIST_GETSTATUSMODEDESCRIPTION, iNewStatus, 0)));
+	LOG(("[SetStatus] New status %S", pcli->pfnGetStatusModeDescription(iNewStatus, 0)));
 
 	if (iNewStatus == ID_STATUS_OFFLINE) {
 
@@ -609,7 +609,7 @@ int __cdecl CYahooProto::SetAwayMsg( int status, const PROTOCHAR* msg )
 {
 	char *c = msg && msg[0] ? mir_utf8encodeT(msg) : NULL;
 
-	DebugLog("[YahooSetAwayMessage] Status: %s, Msg: %s",(char *) CallService(MS_CLIST_GETSTATUSMODEDESCRIPTION, status, 0), (char*) c);
+	DebugLog("[YahooSetAwayMessage] Status: %S, Msg: %s", pcli->pfnGetStatusModeDescription(status, 0), (char*)c);
 
     if (!m_bLoggedIn) {
 		if (m_iStatus == ID_STATUS_OFFLINE) {
diff --git a/protocols/Yahoo/src/services.cpp b/protocols/Yahoo/src/services.cpp
index 7cd7556918..397f655ad2 100644
--- a/protocols/Yahoo/src/services.cpp
+++ b/protocols/Yahoo/src/services.cpp
@@ -71,9 +71,9 @@ void CYahooProto::BroadcastStatus(int s)
 		m_iStatus = ID_STATUS_ONLINE;
 	}
 
-	DebugLog("[yahoo_util_broadcaststatus] Old Status: %s (%d), New Status: %s (%d)",
-		NEWSTR_ALLOCA((char *) CallService(MS_CLIST_GETSTATUSMODEDESCRIPTION, oldStatus, 0)), oldStatus,
-		NEWSTR_ALLOCA((char *) CallService(MS_CLIST_GETSTATUSMODEDESCRIPTION, m_iStatus, 0)), m_iStatus);
+	DebugLog("[yahoo_util_broadcaststatus] Old Status: %S (%d), New Status: %S (%d)",
+		pcli->pfnGetStatusModeDescription(oldStatus, 0), oldStatus,
+		pcli->pfnGetStatusModeDescription(m_iStatus, 0), m_iStatus);
 	ProtoBroadcastAck(NULL, ACKTYPE_STATUS, ACKRESULT_SUCCESS, (HANDLE) oldStatus, (LPARAM)m_iStatus);
 }
 
-- 
cgit v1.2.3