summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Pösel <robyer@seznam.cz>2013-01-15 18:06:55 +0000
committerRobert Pösel <robyer@seznam.cz>2013-01-15 18:06:55 +0000
commit6f435bada1dee4bcaf9269d6b4e0a1437ff746ba (patch)
tree7a46f6fb0eaff034ede24acded11c4be60110623
parentff99b4d9810efbc9013f287b9cb52a852e09b742 (diff)
ICQ: Fixed ICQ 8 detection and added eBuddy (Mobile)
git-svn-id: http://svn.miranda-ng.org/main/trunk@3113 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
-rw-r--r--protocols/IcqOscarJ/src/icq_clients.cpp9
1 files changed, 7 insertions, 2 deletions
diff --git a/protocols/IcqOscarJ/src/icq_clients.cpp b/protocols/IcqOscarJ/src/icq_clients.cpp
index 375afec0ee..9ebbd20f21 100644
--- a/protocols/IcqOscarJ/src/icq_clients.cpp
+++ b/protocols/IcqOscarJ/src/icq_clients.cpp
@@ -972,7 +972,7 @@ const char* CIcqProto::detectUserClient(HANDLE hContact, int nIsICQ, WORD wUserC
{ // capability footprint based detection - not really reliable
if (!dwFT1 && !dwFT2 && !dwFT3 && !dwWebPort && !dwDirectCookie)
{ // DC info is empty
- if (CheckContactCapabilities(hContact, CAPF_UTF | CAPF_CONTACTS | CAPF_XTRAZ | CAPF_OSCAR_FILE | CAPF_STATUS_MOOD))
+ if (CheckContactCapabilities(hContact, CAPF_UTF | CAPF_CONTACTS | CAPF_XTRAZ | CAPF_OSCAR_FILE))
szClient = "ICQ 8";
else if (CheckContactCapabilities(hContact, CAPF_TYPING) && MatchCapability(caps, wLen, &capIs2001) &&
MatchCapability(caps, wLen, &capIs2002) && MatchCapability(caps, wLen, &capComm20012))
@@ -1007,7 +1007,12 @@ const char* CIcqProto::detectUserClient(HANDLE hContact, int nIsICQ, WORD wUserC
else if (CheckContactCapabilities(hContact, CAPF_UTF | CAPF_SRV_RELAY | CAPF_CONTACTS) && MatchShortCapability(caps, wLen, &capAimIcon) && MatchCapability(caps, wLen, &capFakeHtml))
szClient = "mundu IM"; // http://messenger.mundu.com
else if (CheckContactCapabilities(hContact, CAPF_UTF | CAPF_OSCAR_FILE) && MatchCapability(caps, wLen, &capOscarChat))
- szClient = "eBuddy"; //http://www.ebuddy.com
+ {
+ if (CheckContactCapabilities(hContact, CAPF_TYPING))
+ szClient = "eBuddy"; // http://www.ebuddy.com
+ else
+ szClient = "eBuddy (Mobile)";
+ }
else if (CheckContactCapabilities(hContact, CAPF_CONTACTS | CAPF_OSCAR_FILE) && MatchShortCapability(caps, wLen, &capAimIcon) && MatchShortCapability(caps, wLen, &capAimDirect) && MatchCapability(caps, wLen, &capOscarChat))
szClient = "IloveIM"; //http://www.iloveim.com/