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
---
 plugins/IEView/src/Options.cpp | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'plugins/IEView/src')

diff --git a/plugins/IEView/src/Options.cpp b/plugins/IEView/src/Options.cpp
index bc3322e5ed..08d3139304 100644
--- a/plugins/IEView/src/Options.cpp
+++ b/plugins/IEView/src/Options.cpp
@@ -648,10 +648,10 @@ static INT_PTR CALLBACK IEViewSRMMOptDlgProc(HWND hwndDlg, UINT msg, WPARAM wPar
 	case UM_CHECKSTATECHANGE:
 		{
 			ProtocolSettings *proto = (ProtocolSettings *)GetItemParam((HWND)wParam, (HTREEITEM) lParam);
-			if (proto != NULL) {
+			if (proto != NULL)
 				if (strcmpi(proto->getProtocolName(), "_default_"))
 					proto->setSRMMEnableTemp( TreeView_GetCheckState((HWND)wParam, (HTREEITEM) lParam));
-			}
+
 			if ((HTREEITEM) lParam != TreeView_GetSelection((HWND)wParam)) {
 				TreeView_SelectItem((HWND)wParam, (HTREEITEM) lParam);
 			} else {
@@ -791,11 +791,11 @@ static INT_PTR CALLBACK IEViewHistoryOptDlgProc(HWND hwndDlg, UINT msg, WPARAM w
 				if (strcmpi(proto->getProtocolName(), "_default_"))
 					proto->setHistoryEnableTemp(TreeView_GetCheckState((HWND)wParam, (HTREEITEM) lParam));
 
-			if ((HTREEITEM) lParam != TreeView_GetSelection((HWND)wParam)) {
+			if ((HTREEITEM) lParam != TreeView_GetSelection((HWND)wParam))
 				TreeView_SelectItem((HWND)wParam, (HTREEITEM) lParam);
-			} else {
+			else
 				UpdateHistoryProtoInfo(hwndDlg, proto);
-			}
+
 			MarkChanges(4, hwndDlg);
 		}
 		break;
@@ -1516,9 +1516,9 @@ void Options::init() {
 
 	/* TODO: move to buildProtocolList method */
 	int protoCount;
-	PROTOCOLDESCRIPTOR **pProtos;
+	PROTOACCOUNT **pProtos;
 	ProtocolSettings *lastProto = NULL;
-	CallService(MS_PROTO_ENUMPROTOCOLS, (WPARAM)&protoCount, (LPARAM)&pProtos);
+	ProtoEnumAccounts(&protoCount, &pProtos);
 	for (int i = 0; i < protoCount+1; i++) {
 		ProtocolSettings *proto;
 		char tmpPath[MAX_PATH];
@@ -1526,11 +1526,11 @@ void Options::init() {
 		if (i==0) {
 			proto = new ProtocolSettings("_default_");
 			proto->setSRMMEnable(true);
-		} else if ((pProtos[i-1]->type == PROTOTYPE_PROTOCOL) && strcmp(pProtos[i-1]->szName,"MetaContacts")) {
-			if ((CallProtoService(pProtos[i-1]->szName, PS_GETCAPS, PFLAGNUM_1, 0) & PF1_IM) == 0) {
+		} else if (strcmp(pProtos[i-1]->szModuleName,"MetaContacts")) {
+			if ((CallProtoService(pProtos[i-1]->szModuleName, PS_GETCAPS, PFLAGNUM_1, 0) & PF1_IM) == 0) {
 				continue;
 			}
-			proto = new ProtocolSettings(pProtos[i-1]->szName);
+			proto = new ProtocolSettings(pProtos[i-1]->szModuleName);
 		} else {
 			continue;
 		}
-- 
cgit v1.2.3