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
---
 protocols/GTalkExt/src/handlers.cpp      | 4 ++--
 protocols/GTalkExt/src/notifications.cpp | 4 ++--
 protocols/GTalkExt/src/options.cpp       | 2 +-
 protocols/GTalkExt/src/stdafx.h          | 1 -
 4 files changed, 5 insertions(+), 6 deletions(-)

(limited to 'protocols/GTalkExt')

diff --git a/protocols/GTalkExt/src/handlers.cpp b/protocols/GTalkExt/src/handlers.cpp
index 1aa2733414..0c835729f6 100644
--- a/protocols/GTalkExt/src/handlers.cpp
+++ b/protocols/GTalkExt/src/handlers.cpp
@@ -446,7 +446,7 @@ static void sttCreateInstance(LPCSTR szModuleName)
 
 	GoogleTalkAcc *gta = new GoogleTalkAcc();
 	gta->m_japi = japi;
-	gta->m_pa = ProtoGetAccount(szModuleName);
+	gta->m_pa = Proto_GetAccount(szModuleName);
 	g_accs.insert(gta);
 
 	// Google Shared Status (http://code.google.com/apis/talk/jep_extensions/shared_status.html)
@@ -467,7 +467,7 @@ int ModulesLoaded(WPARAM, LPARAM)
 {
 	int count;
 	PROTOACCOUNT **protos;
-	ProtoEnumAccounts(&count, &protos);
+	Proto_EnumAccounts(&count, &protos);
 	for (int i = 0; i < count; i++)
 		sttCreateInstance(protos[i]->szModuleName);
 
diff --git a/protocols/GTalkExt/src/notifications.cpp b/protocols/GTalkExt/src/notifications.cpp
index e7813894c1..9f0dd6dbde 100644
--- a/protocols/GTalkExt/src/notifications.cpp
+++ b/protocols/GTalkExt/src/notifications.cpp
@@ -51,7 +51,7 @@ LPCSTR GetJidAcc(LPCTSTR jid)
 {
 	int count = 0;
 	PROTOACCOUNT **protos;
-	ProtoEnumAccounts(&count, &protos);
+	Proto_EnumAccounts(&count, &protos);
 	for (int i = 0; i < count; i++) {
 		if (getJabberApi(protos[i]->szModuleName)) {
 			ptrT tszJid(db_get_tsa(0, protos[i]->szModuleName, "jid"));
@@ -171,7 +171,7 @@ MCONTACT SetupPseudocontact(LPCTSTR jid, LPCTSTR unreadCount, LPCSTR acc, LPCTST
 		hContact = (MCONTACT)CallService(MS_DB_CONTACT_ADD, 0, 0);
 		db_set_dw(0, acc, PSEUDOCONTACT_LINK, hContact);
 		db_set_b(hContact, SHORT_PLUGIN_NAME, PSEUDOCONTACT_FLAG, 1);
-		CallService(MS_PROTO_ADDTOCONTACT, hContact, (LPARAM)acc);
+		Proto_AddToContact(hContact, acc);
 	}
 
 	// SetAvatar(hContact);
diff --git a/protocols/GTalkExt/src/options.cpp b/protocols/GTalkExt/src/options.cpp
index b15eb53042..eb5286d7f5 100644
--- a/protocols/GTalkExt/src/options.cpp
+++ b/protocols/GTalkExt/src/options.cpp
@@ -241,7 +241,7 @@ int OptionsInitialization(WPARAM wParam, LPARAM)
 
 	for (int i = 0; i < g_accs.getCount(); i++) {
 		LPCSTR szProto = g_accs[i]->m_pa->szModuleName;
-		PROTOACCOUNT *pa = ProtoGetAccount(szProto);
+		PROTOACCOUNT *pa = Proto_GetAccount(szProto);
 		if (pa != NULL) {
 			OPTIONSDIALOGPAGE odp = { 0 };
 			odp.ptszTitle = pa->tszAccountName;
diff --git a/protocols/GTalkExt/src/stdafx.h b/protocols/GTalkExt/src/stdafx.h
index 00a2ea659e..86f1fdb01b 100644
--- a/protocols/GTalkExt/src/stdafx.h
+++ b/protocols/GTalkExt/src/stdafx.h
@@ -54,7 +54,6 @@
 #include <m_langpack.h>
 #include <m_protosvc.h>
 #include <m_protocols.h>
-#include <m_protomod.h>
 #include <m_protoint.h>
 #include <m_options.h>
 #include <m_utils.h>
-- 
cgit v1.2.3