From c6fb861d7159279b6ee4a4dd678d4693ee56bac6 Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Sun, 7 Oct 2012 12:50:40 +0000
Subject: death of old nasty clutch with MS_PROTO_ENUMPROTOCOLS &
 PROTOACCOUNT::type

git-svn-id: http://svn.miranda-ng.org/main/trunk@1799 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 protocols/GTalkExt/db.cpp            |  8 ++++----
 protocols/GTalkExt/handlers.cpp      |  6 +++---
 protocols/GTalkExt/notifications.cpp | 10 +++++-----
 3 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'protocols')

diff --git a/protocols/GTalkExt/db.cpp b/protocols/GTalkExt/db.cpp
index ac716ed768..1e9c3deb23 100644
--- a/protocols/GTalkExt/db.cpp
+++ b/protocols/GTalkExt/db.cpp
@@ -82,11 +82,11 @@ void WriteJidSetting(LPCSTR name, LPCTSTR jid, LPCTSTR setting)
 void RenewPseudocontactHandles()
 {
 	int count = 0;
-	PROTOCOLDESCRIPTOR **protos;
-	CallService(MS_PROTO_ENUMPROTOCOLS, (WPARAM)&count, (LPARAM)&protos);
+	PROTOACCOUNT **protos;
+	ProtoEnumAccounts(&count, &protos);
 	for (int i = 0; i < count; i++) {
-		DBDeleteContactSetting(0, protos[i]->szName, PSEUDOCONTACT_LINK);
-		DBDeleteContactSetting(0, protos[i]->szName, "GMailExtNotifyContact");	// remove this
+		DBDeleteContactSetting(0, protos[i]->szModuleName, PSEUDOCONTACT_LINK);
+		DBDeleteContactSetting(0, protos[i]->szModuleName, "GMailExtNotifyContact");	// remove this
 	}
 
 	HANDLE hContact = (HANDLE)CallService(MS_DB_CONTACT_FINDFIRST, 0, 0);
diff --git a/protocols/GTalkExt/handlers.cpp b/protocols/GTalkExt/handlers.cpp
index 879e5ee820..7bd814a802 100644
--- a/protocols/GTalkExt/handlers.cpp
+++ b/protocols/GTalkExt/handlers.cpp
@@ -420,10 +420,10 @@ int ModulesLoaded(WPARAM wParam, LPARAM lParam)
 	DetectPopupModule();
 
 	int count;
-	PROTOCOLDESCRIPTOR **protos;
-	CallService(MS_PROTO_ENUMPROTOCOLS, (WPARAM)&count, (LPARAM)&protos);
+	PROTOACCOUNT **protos;
+	ProtoEnumAccounts(&count, &protos);
 	for (int i = 0; i < count; i++) {
-		IJabberInterface *japi = getJabberApi(protos[i]->szName);
+		IJabberInterface *japi = getJabberApi(protos[i]->szModuleName);
 		if (japi) japi->Net()->AddSendHandler(SendHandler);
 	}
 
diff --git a/protocols/GTalkExt/notifications.cpp b/protocols/GTalkExt/notifications.cpp
index 8a8d8a618e..9a1819a7f1 100644
--- a/protocols/GTalkExt/notifications.cpp
+++ b/protocols/GTalkExt/notifications.cpp
@@ -75,15 +75,15 @@ LRESULT CALLBACK WndProc(HWND wnd, UINT msg, WPARAM wParam, LPARAM lParam)
 LPCSTR GetJidAcc(LPCTSTR jid)
 {
 	int count = 0;
-	PROTOCOLDESCRIPTOR **protos;
-	CallService(MS_PROTO_ENUMPROTOCOLS, (WPARAM)&count, (LPARAM)&protos);
+	PROTOACCOUNT **protos;
+	ProtoEnumAccounts(&count, &protos);
 
 	DBVARIANT dbv;
 	for (int i = 0; i < count; i++)
-		if (getJabberApi(protos[i]->szName))
-			if (!DBGetContactSettingTString(0, protos[i]->szName, "jid", &dbv))
+		if (getJabberApi(protos[i]->szModuleName))
+			if (!DBGetContactSettingTString(0, protos[i]->szModuleName, "jid", &dbv))
 				__try {
-					if (!lstrcmpi(jid, dbv.ptszVal)) return protos[i]->szName;
+					if (!lstrcmpi(jid, dbv.ptszVal)) return protos[i]->szModuleName;
 				}
 				__finally {
 					DBFreeVariant(&dbv);
-- 
cgit v1.2.3