From dd13e3c81400c3607a4f63a501b53b46052035ab Mon Sep 17 00:00:00 2001 From: Sergey Bolhovskoy Date: Thu, 23 Apr 2015 11:36:27 +0000 Subject: SmileyAdd: add per protocol global smiley packs support version bump git-svn-id: http://svn.miranda-ng.org/main/trunk@13056 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/SmileyAdd/src/services.cpp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'plugins/SmileyAdd/src/services.cpp') diff --git a/plugins/SmileyAdd/src/services.cpp b/plugins/SmileyAdd/src/services.cpp index 904da99971..a06f5468ba 100644 --- a/plugins/SmileyAdd/src/services.cpp +++ b/plugins/SmileyAdd/src/services.cpp @@ -49,7 +49,13 @@ SmileyPackType* GetSmileyPack(const char* proto, MCONTACT hContact, SmileyPackCT categoryName = dbv.ptszVal; db_free(&dbv); } - else categoryName = A2T_SM(protonam); + else if (opt.UsePhysProto && db_get_ts(NULL, protonam, "AM_BaseProto", &dbv) == 0){ + categoryName = _T("AllProto"); + categoryName += dbv.ptszVal; + db_free(&dbv); + } + else + categoryName = A2T_SM(protonam); } } } -- cgit v1.2.3