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/MRA/src/Mra.cpp       | 2 ++
 protocols/MRA/src/Mra.h         | 4 +---
 protocols/MRA/src/Mra_proto.cpp | 2 +-
 protocols/MRA/src/Mra_svcs.cpp  | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'protocols/MRA/src')

diff --git a/protocols/MRA/src/Mra.cpp b/protocols/MRA/src/Mra.cpp
index efaddcfd34..ca07b67f0a 100644
--- a/protocols/MRA/src/Mra.cpp
+++ b/protocols/MRA/src/Mra.cpp
@@ -3,6 +3,7 @@
 LIST<CMraProto> g_Instances(1, PtrKeySortT);
 
 MRA_SETTINGS masMraSettings;
+CLIST_INTERFACE *pcli;
 int hLangpack;
 
 PLUGININFOEX pluginInfoEx = {
@@ -79,6 +80,7 @@ static int OnPreShutdown(WPARAM, LPARAM)
 extern "C" __declspec(dllexport) int Load(void)
 {
 	mir_getLP(&pluginInfoEx);
+	mir_getCLI();
 
 	IconsLoad();
 
diff --git a/protocols/MRA/src/Mra.h b/protocols/MRA/src/Mra.h
index cf8a474842..b5ef8016e5 100644
--- a/protocols/MRA/src/Mra.h
+++ b/protocols/MRA/src/Mra.h
@@ -42,6 +42,7 @@
 #include <m_system_cpp.h>
 #include <m_protocols.h>
 #include <m_clist.h>
+#include <m_clistint.h>
 #include <m_cluiframes.h>
 #include <m_clui.h>
 #include <m_genmenu.h>
@@ -222,9 +223,6 @@ CMStringA MraGetSelfVersionString();
 #define GetContactNameA(Contact) (LPSTR)CallService(MS_CLIST_GETCONTACTDISPLAYNAME, (WPARAM)Contact, 0)
 #define GetContactNameW(Contact) (LPWSTR)CallService(MS_CLIST_GETCONTACTDISPLAYNAME, (WPARAM)Contact, GCDNF_UNICODE)
 
-#define GetStatusModeDescriptionA(Status) (LPSTR)CallService(MS_CLIST_GETSTATUSMODEDESCRIPTION, (WPARAM)Status, 0)
-#define GetStatusModeDescriptionW(Status) (LPWSTR)CallService(MS_CLIST_GETSTATUSMODEDESCRIPTION, (WPARAM)Status, GSMDF_UNICODE)
-
 #define SetBit(bytes, bitpos) bytes |= (1<<bitpos)
 #define GetBit(bytes, bitpos) ((bytes&(1<<bitpos))? TRUE:FALSE)
 
diff --git a/protocols/MRA/src/Mra_proto.cpp b/protocols/MRA/src/Mra_proto.cpp
index e57266d7a8..23f9a039ae 100644
--- a/protocols/MRA/src/Mra_proto.cpp
+++ b/protocols/MRA/src/Mra_proto.cpp
@@ -390,7 +390,7 @@ bool CMraProto::CmdHelloAck(BinBuffer &buf)
 		mir_snprintf(szValueName, SIZEOF(szValueName), "XStatus%ldMsg", dwXStatusMir);
 		mraGetStringW(NULL, szValueName, wszStatusDesc);
 	}
-	else wszStatusTitle = GetStatusModeDescriptionW(m_iDesiredStatus);
+	else wszStatusTitle = pcli->pfnGetStatusModeDescription(m_iDesiredStatus, 0);
 
 	CMStringA szSelfVersionString = MraGetSelfVersionString();
 	if ( !mraGetStringA(NULL, "MirVerCustom", szUserAgentFormatted))
diff --git a/protocols/MRA/src/Mra_svcs.cpp b/protocols/MRA/src/Mra_svcs.cpp
index 48295be603..fa41da557a 100644
--- a/protocols/MRA/src/Mra_svcs.cpp
+++ b/protocols/MRA/src/Mra_svcs.cpp
@@ -880,7 +880,7 @@ DWORD CMraProto::MraSendNewStatus(DWORD dwStatusMir, DWORD dwXStatusMir, const C
 		else wszStatusDesc = pwszStatusDesc;
 	}
 	else if (pwszStatusTitle.IsEmpty())
-		wszStatusTitle = GetStatusModeDescriptionW(dwStatusMir);
+		wszStatusTitle = pcli->pfnGetStatusModeDescription(dwStatusMir, 0);
 
 	MraChangeStatus(dwStatus, lpcszStatusUri[dwXStatus], wszStatusTitle, wszStatusDesc, ((getByte("RTFReceiveEnable", MRA_DEFAULT_RTF_RECEIVE_ENABLE)? FEATURE_FLAG_RTF_MESSAGE:0)|MRA_FEATURE_FLAGS));
 	return 0;
-- 
cgit v1.2.3