From fd511dcd6739e2994445833ac8f03f01a2c5df95 Mon Sep 17 00:00:00 2001
From: Sergey Bolhovskoy <elzorfox@ya.ru>
Date: Mon, 27 Apr 2015 07:26:14 +0000
Subject: SmileyAdd: rework global and account packs cooperation

git-svn-id: http://svn.miranda-ng.org/main/trunk@13190 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 plugins/SmileyAdd/src/smileys.cpp | 37 ++++++++++++++++++++++++++-----------
 1 file changed, 26 insertions(+), 11 deletions(-)

(limited to 'plugins/SmileyAdd/src/smileys.cpp')

diff --git a/plugins/SmileyAdd/src/smileys.cpp b/plugins/SmileyAdd/src/smileys.cpp
index a8c2240b89..c2a18de08f 100644
--- a/plugins/SmileyAdd/src/smileys.cpp
+++ b/plugins/SmileyAdd/src/smileys.cpp
@@ -724,6 +724,7 @@ SmileyCategoryType::SmileyCategoryType(SmileyPackListType* pSPS, const CMString&
 	type = typ; 
 	m_Name = name; 
 	m_DisplayName = displayName;
+	visible = true;
 
 	opt.ReadPackFileName(m_Filename, m_Name, defaultFilename);
 }
@@ -834,21 +835,35 @@ void SmileyCategoryListType::AddAccountAsCategory(PROTOACCOUNT *acc, const CMStr
 	if (IsAccountEnabled(acc) && acc->szProtoName && IsSmileyProto(acc->szModuleName))
 	{
 		CMString displayName(acc->tszAccountName ? acc->tszAccountName : A2T_SM(acc->szModuleName));
+		CMString PhysProtoName, paths;
+		DBVARIANT dbv;
+		
+		if (db_get_ts(NULL, acc->szModuleName, "AM_BaseProto", &dbv) == 0){
+			PhysProtoName = _T("AllProto");
+			PhysProtoName += dbv.ptszVal;
+			db_free(&dbv);		
+		}
 
-		const char* packnam = acc->szProtoName;
-		if (strcmp(packnam, "JABBER") == 0)
-			packnam = "JGMail";
-		else if (strstr(packnam, "SIP") != NULL)
-			packnam = "MSN";
+		if (!PhysProtoName.IsEmpty())
+			paths = g_SmileyCategories.GetSmileyCategory(PhysProtoName)->GetFilename();
+		
+		if (paths.IsEmpty()){
+			const char* packnam = acc->szProtoName;
+			if (strcmp(packnam, "JABBER") == 0)
+				packnam = "JGMail";
+			else if (strstr(packnam, "SIP") != NULL)
+				packnam = "MSN";
 
-		char path[MAX_PATH];
-		mir_snprintf(path, SIZEOF(path), "Smileys\\nova\\%s.msl", packnam);
+			char path[MAX_PATH];
+			mir_snprintf(path, SIZEOF(path), "Smileys\\nova\\%s.msl", packnam);
 
-		CMString paths = A2T_SM(path), patha; 
-		pathToAbsolute(paths, patha);
+			paths = A2T_SM(path); 
+			CMString patha;
+			pathToAbsolute(paths, patha);
 
-		if (_taccess(patha.c_str(), 0) != 0) 
-			paths = defaultFile;
+			if (_taccess(patha.c_str(), 0) != 0)
+				paths = defaultFile;
+		}
 
 		CMString tname(A2T_SM(acc->szModuleName));
 		AddCategory(tname, displayName, smcProto, paths); 
-- 
cgit v1.2.3