From 83310365c69bd40365ee0ae0e16c99c28e24cd0b Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Fri, 19 Jun 2015 14:24:12 +0000
Subject: - all static protocol services replaced with functions; -
 m_protomod.h removed as useless

git-svn-id: http://svn.miranda-ng.org/main/trunk@14260 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 plugins/TabSRMM/src/chat/tools.cpp   | 2 +-
 plugins/TabSRMM/src/commonheaders.h  | 1 -
 plugins/TabSRMM/src/contactcache.cpp | 4 ++--
 plugins/TabSRMM/src/eventpopups.cpp  | 2 +-
 plugins/TabSRMM/src/trayicon.cpp     | 2 +-
 5 files changed, 5 insertions(+), 6 deletions(-)

(limited to 'plugins/TabSRMM/src')

diff --git a/plugins/TabSRMM/src/chat/tools.cpp b/plugins/TabSRMM/src/chat/tools.cpp
index c0aea1f488..fa3c09ec13 100644
--- a/plugins/TabSRMM/src/chat/tools.cpp
+++ b/plugins/TabSRMM/src/chat/tools.cpp
@@ -112,7 +112,7 @@ int ShowPopup(MCONTACT hContact, SESSION_INFO *si, HICON hIcon, char* pszProtoNa
 	else
 		pd.lchIcon = LoadIconEx("window");
 
-	PROTOACCOUNT *pa = ProtoGetAccount(pszProtoName);
+	PROTOACCOUNT *pa = Proto_GetAccount(pszProtoName);
 	mir_sntprintf(pd.lptzContactName, SIZEOF(pd.lptzContactName), _T("%s - %s"),
 		(pa == NULL) ? _A2T(pszProtoName) : pa->tszAccountName,
 		pcli->pfnGetContactDisplayName(hContact, 0));
diff --git a/plugins/TabSRMM/src/commonheaders.h b/plugins/TabSRMM/src/commonheaders.h
index e66fa8fb24..2aa8eb0347 100644
--- a/plugins/TabSRMM/src/commonheaders.h
+++ b/plugins/TabSRMM/src/commonheaders.h
@@ -69,7 +69,6 @@
 #include <m_fontservice.h>
 #include <m_acc.h>
 #include <m_chat_int.h>
-#include <m_protomod.h>
 #include <m_hotkeys.h>
 #include <m_genmenu.h>
 #include <m_popup.h>
diff --git a/plugins/TabSRMM/src/contactcache.cpp b/plugins/TabSRMM/src/contactcache.cpp
index 7b1583e0d4..6429432ee9 100644
--- a/plugins/TabSRMM/src/contactcache.cpp
+++ b/plugins/TabSRMM/src/contactcache.cpp
@@ -61,7 +61,7 @@ void CContactCache::initPhaseTwo()
 {
 	m_szAccount = 0;
 	if (cc->szProto) {
-		PROTOACCOUNT *acc = ProtoGetAccount(cc->szProto);
+		PROTOACCOUNT *acc = Proto_GetAccount(cc->szProto);
 		if (acc && acc->tszAccountName)
 			m_szAccount = acc->tszAccountName;
 	}
@@ -152,7 +152,7 @@ void CContactCache::updateMeta()
 		m_hSub = db_mc_getSrmmSub(cc->contactID);
 		m_szMetaProto = GetContactProto(m_hSub);
 		m_wMetaStatus = (WORD)db_get_w(m_hSub, m_szMetaProto, "Status", ID_STATUS_OFFLINE);
-		PROTOACCOUNT *pa = ProtoGetAccount(m_szMetaProto);
+		PROTOACCOUNT *pa = Proto_GetAccount(m_szMetaProto);
 		if (pa)
 			m_szAccount = pa->tszAccountName;
 
diff --git a/plugins/TabSRMM/src/eventpopups.cpp b/plugins/TabSRMM/src/eventpopups.cpp
index 402c169e67..e39e300218 100644
--- a/plugins/TabSRMM/src/eventpopups.cpp
+++ b/plugins/TabSRMM/src/eventpopups.cpp
@@ -694,7 +694,7 @@ int TSAPI UpdateTrayMenu(const TWindowData *dat, WORD wStatus, const char *szPro
 	if (!PluginConfig.g_hMenuTrayUnread || hContact == 0 || szProto == NULL)
 		return 0;
 
-	PROTOACCOUNT *acc = ProtoGetAccount(szProto);
+	PROTOACCOUNT *acc = Proto_GetAccount(szProto);
 	TCHAR *tszFinalProto = (acc && acc->tszAccountName ? acc->tszAccountName : 0);
 	if (tszFinalProto == 0)
 		return 0;
diff --git a/plugins/TabSRMM/src/trayicon.cpp b/plugins/TabSRMM/src/trayicon.cpp
index 950b90c482..6cd62d5a68 100644
--- a/plugins/TabSRMM/src/trayicon.cpp
+++ b/plugins/TabSRMM/src/trayicon.cpp
@@ -214,7 +214,7 @@ void TSAPI AddContactToFavorites(MCONTACT hContact, const TCHAR *szNickname, con
 	if (hIcon == 0)
 		hIcon = Skin_LoadProtoIcon(szProto, wStatus);
 
-	PROTOACCOUNT *acc = ProtoGetAccount(szProto);
+	PROTOACCOUNT *acc = Proto_GetAccount(szProto);
 	if (acc && acc->tszAccountName) {
 		mii.cbSize = sizeof(mii);
 		mir_sntprintf(szMenuEntry, SIZEOF(szMenuEntry), _T("%s: %s (%s)"), acc->tszAccountName, szFinalNick, szStatus);
-- 
cgit v1.2.3