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/UserInfoEx/src/classPsTreeItem.cpp | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

(limited to 'plugins/UserInfoEx/src/classPsTreeItem.cpp')

diff --git a/plugins/UserInfoEx/src/classPsTreeItem.cpp b/plugins/UserInfoEx/src/classPsTreeItem.cpp
index 2231f7c157..f5d6d28d63 100644
--- a/plugins/UserInfoEx/src/classPsTreeItem.cpp
+++ b/plugins/UserInfoEx/src/classPsTreeItem.cpp
@@ -274,21 +274,21 @@ int CPsTreeItem::ItemLabel(const BYTE bReadDBValue)
  **/
 HICON CPsTreeItem::ProtoIcon()
 {
+	if (!_pszName)
+		return NULL;
+
 	PROTOACCOUNT **pa;
 	int ProtoCount;
-	if (!ProtoEnumAccounts(&ProtoCount, &pa)) {
-		if (_pszName) {
-			for (int i = 0; i < ProtoCount; i++) {
-				if (!mir_tcsnicmp(pa[i]->tszAccountName, _A2T(_pszName), mir_tstrlen(pa[i]->tszAccountName))) {
-					CHAR szIconID[MAX_PATH];
-					mir_snprintf(szIconID, SIZEOF(szIconID), "core_status_%s1", pa[i]->szModuleName);
-					HICON hIco = IcoLib_GetIcon(szIconID);
-					if (!hIco)
-						hIco = (HICON)CallProtoService(pa[i]->szModuleName, PS_LOADICON, PLI_PROTOCOL, NULL);
-
-					return hIco;
-				}
-			}
+	Proto_EnumAccounts(&ProtoCount, &pa);
+	for (int i = 0; i < ProtoCount; i++) {
+		if (!mir_tcsnicmp(pa[i]->tszAccountName, _A2T(_pszName), mir_tstrlen(pa[i]->tszAccountName))) {
+			CHAR szIconID[MAX_PATH];
+			mir_snprintf(szIconID, SIZEOF(szIconID), "core_status_%s1", pa[i]->szModuleName);
+			HICON hIco = IcoLib_GetIcon(szIconID);
+			if (!hIco)
+				hIco = (HICON)CallProtoService(pa[i]->szModuleName, PS_LOADICON, PLI_PROTOCOL, NULL);
+
+			return hIco;
 		}
 	}
 	return NULL;
-- 
cgit v1.2.3