From 1d28f884c5750602ab5479c6ee978ba9e14adf9d Mon Sep 17 00:00:00 2001 From: George Hazan Date: Tue, 7 Apr 2015 14:36:09 +0000 Subject: ICQ client detection for MRA git-svn-id: http://svn.miranda-ng.org/main/trunk@12657 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- protocols/MRA/src/Mra_functions.cpp | 15 ++++++++------- protocols/MRA/src/Mra_proto.cpp | 4 ++-- 2 files changed, 10 insertions(+), 9 deletions(-) (limited to 'protocols') diff --git a/protocols/MRA/src/Mra_functions.cpp b/protocols/MRA/src/Mra_functions.cpp index ab7331934f..6667a15608 100644 --- a/protocols/MRA/src/Mra_functions.cpp +++ b/protocols/MRA/src/Mra_functions.cpp @@ -506,13 +506,14 @@ MCONTACT CMraProto::MraHContactFromEmail(const CMStringA &szEmail, BOOL bAddIfNe //check not already on list CMStringA szEMailLocal; - for (hContact = db_find_first(m_szModuleName); hContact; hContact = db_find_next(hContact, m_szModuleName)) - if (mraGetStringA(hContact, "e-mail", szEMailLocal)) - if (szEMailLocal == szEmail) { - if (bTemporary == FALSE) - db_unset(hContact, "CList", "NotOnList"); - bFound = true; - break; + for (hContact = db_find_first(m_szModuleName); hContact; hContact = db_find_next(hContact, m_szModuleName)) { + if (mraGetStringA(hContact, "e-mail", szEMailLocal)) + if (szEMailLocal == szEmail) { + if (bTemporary == FALSE) + db_unset(hContact, "CList", "NotOnList"); + bFound = true; + break; + } } if (!bFound && bAddIfNeeded) { diff --git a/protocols/MRA/src/Mra_proto.cpp b/protocols/MRA/src/Mra_proto.cpp index 596fe4d1b9..7951ea777c 100644 --- a/protocols/MRA/src/Mra_proto.cpp +++ b/protocols/MRA/src/Mra_proto.cpp @@ -679,13 +679,13 @@ bool CMraProto::CmdUserStatus(BinBuffer &buf) delSetting(hContact, DBSETTING_XSTATUSMSG); } - if (dwTemp != ID_STATUS_OFFLINE) { // пишем клиента только если юзер не отключён, иначе не затираем старое if (!szUserAgentFormatted.IsEmpty()) { if (getByte("MirVerRaw", MRA_DEFAULT_MIRVER_RAW) == FALSE) szUserAgentFormatted = MraGetVersionStringFromFormatted(szUserAgentFormatted); } - else szUserAgentFormatted = MIRVER_UNKNOWN; + else szUserAgentFormatted = (szEmail.Find("@uin.icq") == -1) ? MIRVER_UNKNOWN : "ICQ client"; + mraSetStringA(hContact, "MirVer", szUserAgentFormatted); } -- cgit v1.2.3