From d4b7afde39bc9bbba90dfe8ada90eb2495e18a11 Mon Sep 17 00:00:00 2001 From: MikalaiR Date: Sat, 6 Jun 2015 17:29:23 +0000 Subject: SkypeWeb: Fix encoding problem. Fix login case sensitivy in IsMe(). Version bump. git-svn-id: http://svn.miranda-ng.org/main/trunk@14025 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- protocols/SkypeWeb/src/skype_history_sync.cpp | 4 ++-- protocols/SkypeWeb/src/skype_messages.cpp | 4 ++-- protocols/SkypeWeb/src/skype_utils.cpp | 2 +- protocols/SkypeWeb/src/version.h | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) (limited to 'protocols') diff --git a/protocols/SkypeWeb/src/skype_history_sync.cpp b/protocols/SkypeWeb/src/skype_history_sync.cpp index 9508b53cbd..507cedfc05 100644 --- a/protocols/SkypeWeb/src/skype_history_sync.cpp +++ b/protocols/SkypeWeb/src/skype_history_sync.cpp @@ -93,9 +93,9 @@ void CSkypeProto::OnGetServerHistory(const NETLIBHTTPREQUEST *response) _tcsftime_l(time, sizeof(time), L"%X %x", localtime(×tamp), locale); _free_locale(locale); - CMStringA msg(FORMAT, "%s\n%s %s:\n%s", dbMsgText, Translate("Edited at"), _T2A(time), message); + CMStringA msg(FORMAT, "%s\n%s %s:\n%s", mir_utf8decodeA(dbMsgText), Translate("Edited at"), T2Utf(time), mir_utf8decodeA(message)); db_event_delete(hContact, dbevent); - AddMessageToDb(hContact, dbEventTimestamp, flags, clientMsgId.c_str(), msg.GetBuffer(), emoteOffset); + AddMessageToDb(hContact, dbEventTimestamp, flags, clientMsgId.c_str(), mir_utf8encode(msg.GetBuffer()), emoteOffset); } else AddMessageToDb(hContact, timestamp, flags, clientMsgId.c_str(), message, emoteOffset); } diff --git a/protocols/SkypeWeb/src/skype_messages.cpp b/protocols/SkypeWeb/src/skype_messages.cpp index a990eb669b..0cc32e4433 100644 --- a/protocols/SkypeWeb/src/skype_messages.cpp +++ b/protocols/SkypeWeb/src/skype_messages.cpp @@ -186,9 +186,9 @@ void CSkypeProto::OnPrivateMessageEvent(const JSONNode &node) _tcsftime_l(time, sizeof(time), L"%X %x", localtime(×tamp), locale); _free_locale(locale); - msg.AppendFormat("%s\n%s %s:\n%s", dbMsgText, Translate("Edited at"), _T2A(time), message); + msg.AppendFormat("%s\n%s %s:\n%s", mir_utf8decodeA(dbMsgText), Translate("Edited at"), T2Utf(time), mir_utf8decodeA(message)); db_event_delete(hContact, dbevent); - AddMessageToDb(hContact, dbEventTimestamp, DBEF_UTF, skypeEditedId.c_str(), msg.GetBuffer()); + AddMessageToDb(hContact, dbEventTimestamp, DBEF_UTF, skypeEditedId.c_str(), mir_utf8encode(msg.GetBuffer())); } else OnReceiveMessage(clientMsgId.c_str(), conversationLink.c_str(), timestamp, message, emoteOffset); } diff --git a/protocols/SkypeWeb/src/skype_utils.cpp b/protocols/SkypeWeb/src/skype_utils.cpp index fe55c22841..9430f0f2e6 100644 --- a/protocols/SkypeWeb/src/skype_utils.cpp +++ b/protocols/SkypeWeb/src/skype_utils.cpp @@ -421,7 +421,7 @@ bool CSkypeProto::IsMe(const char *skypeName) { ptrA mySkypeName(getStringA(SKYPE_SETTINGS_ID)); ptrA SelfEndpointName(getStringA("SelfEndpointName")); - if (!mir_strcmp(skypeName, mySkypeName) || !mir_strcmp(skypeName, SelfEndpointName)) + if (!mir_strcmpi(skypeName, mySkypeName) || !mir_strcmp(skypeName, SelfEndpointName)) return true; return false; } diff --git a/protocols/SkypeWeb/src/version.h b/protocols/SkypeWeb/src/version.h index d50ace6aa7..b8357a2fcc 100644 --- a/protocols/SkypeWeb/src/version.h +++ b/protocols/SkypeWeb/src/version.h @@ -1,7 +1,7 @@ #define __MAJOR_VERSION 0 #define __MINOR_VERSION 12 -#define __RELEASE_NUM 0 -#define __BUILD_NUM 1 +#define __RELEASE_NUM 1 +#define __BUILD_NUM 0 #include -- cgit v1.2.3