summaryrefslogtreecommitdiff
path: root/plugins
diff options
context:
space:
mode:
authorRobert Pösel <robyer@seznam.cz>2012-05-28 09:27:07 +0000
committerRobert Pösel <robyer@seznam.cz>2012-05-28 09:27:07 +0000
commit920181e8bd7ee69f456d1e415bd7270c7b23c1f8 (patch)
treec545cd703ec461d89f2db8c68ce7120699d9c112 /plugins
parent2e24ff74524383fdfa01d0269454aa57b9e7594b (diff)
SmileyAdd: Protos with only PF1_CHAT flag (and no PF1_IM) should be supported too
git-svn-id: http://svn.miranda-ng.org/main/trunk@207 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins')
-rw-r--r--plugins/SmileyAdd/dlgboxsubclass.cpp6
-rw-r--r--plugins/SmileyAdd/general.cpp2
2 files changed, 4 insertions, 4 deletions
diff --git a/plugins/SmileyAdd/dlgboxsubclass.cpp b/plugins/SmileyAdd/dlgboxsubclass.cpp
index 8da22c6cb1..9e90dd3f81 100644
--- a/plugins/SmileyAdd/dlgboxsubclass.cpp
+++ b/plugins/SmileyAdd/dlgboxsubclass.cpp
@@ -214,7 +214,7 @@ public:
}
else
{
- doSmileyReplace = true;;
+ doSmileyReplace = true;
OldButtonPlace = false;
showButtonLine = DBGetContactSettingByte(NULL, "SRMM", "ShowButtonLine", TRUE) != 0;
}
@@ -224,8 +224,8 @@ public:
if (ProtocolName[0] != 0)
{
INT_PTR cap = CallProtoService(ProtocolName, PS_GETCAPS, PFLAGNUM_1, 0);
- doSmileyButton &= ((cap & PF1_IMSEND) != 0);
- doSmileyReplace &= ((cap & PF1_IMRECV) != 0);
+ doSmileyButton &= ((cap & (PF1_IMSEND | PF1_CHAT)) != 0);
+ doSmileyReplace &= ((cap & (PF1_IMRECV | PF1_CHAT)) != 0);
}
if (doSmileyButton && opt.PluginSupportEnabled)
diff --git a/plugins/SmileyAdd/general.cpp b/plugins/SmileyAdd/general.cpp
index 0e1c6e7131..b4fdc07df3 100644
--- a/plugins/SmileyAdd/general.cpp
+++ b/plugins/SmileyAdd/general.cpp
@@ -271,7 +271,7 @@ HANDLE DecodeMetaContact(HANDLE hContact)
bool IsSmileyProto(char* proto)
{
return proto && (!metaProtoName || strcmp(proto, metaProtoName)) &&
- (CallProtoService(proto, PS_GETCAPS, PFLAGNUM_1, 0) & PF1_IM);
+ (CallProtoService(proto, PS_GETCAPS, PFLAGNUM_1, 0) & (PF1_IM | PF1_CHAT));
}
void ReportError(const TCHAR* errmsg)