From b09cd0eea16d71ce0d7d36bc7481e51b7bf431b3 Mon Sep 17 00:00:00 2001 From: MikalaiR Date: Sat, 23 May 2015 12:56:36 +0000 Subject: SkypeWeb: Not add "[]" to MirVer. Warning fix. git-svn-id: http://svn.miranda-ng.org/main/trunk@13771 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- protocols/SkypeWeb/src/skype_history_sync.cpp | 3 +-- protocols/SkypeWeb/src/skype_poll_processing.cpp | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) (limited to 'protocols/SkypeWeb/src') diff --git a/protocols/SkypeWeb/src/skype_history_sync.cpp b/protocols/SkypeWeb/src/skype_history_sync.cpp index 680a4521e0..834b9a8c12 100644 --- a/protocols/SkypeWeb/src/skype_history_sync.cpp +++ b/protocols/SkypeWeb/src/skype_history_sync.cpp @@ -231,7 +231,6 @@ void CSkypeProto::OnSyncHistory(const NETLIBHTTPREQUEST *response) if (json_empty(lastMessage)) continue; - char *clientMsgId = mir_t2a(json_as_string(json_get(lastMessage, "clientmessageid"))); char *conversationLink = mir_t2a(json_as_string(json_get(lastMessage, "conversationLink"))); time_t composeTime(IsoToUnixTime(ptrT(json_as_string(json_get(lastMessage, "composetime"))))); @@ -244,7 +243,7 @@ void CSkypeProto::OnSyncHistory(const NETLIBHTTPREQUEST *response) if (hContact == NULL) continue; - if (/*GetLastMessageTime(hContact) < composeTime || */db_get_dw(hContact, m_szModuleName, "LastMsgTime", 0) < composeTime) + if (db_get_dw(hContact, m_szModuleName, "LastMsgTime", 0) < composeTime) { PushRequest(new GetHistoryRequest(RegToken, skypename, 100, false, 0, Server), &CSkypeProto::OnGetServerHistory); HistorySynced = true; diff --git a/protocols/SkypeWeb/src/skype_poll_processing.cpp b/protocols/SkypeWeb/src/skype_poll_processing.cpp index 9e4f02eca5..ba65d4cc06 100644 --- a/protocols/SkypeWeb/src/skype_poll_processing.cpp +++ b/protocols/SkypeWeb/src/skype_poll_processing.cpp @@ -92,7 +92,7 @@ void CSkypeProto::ProcessEndpointPresenceRes(JSONNODE *node) if (privateInfo != NULL) { ptrA epname(mir_t2a(ptrT(json_as_string(json_get(privateInfo, "epname"))))); - if (epname != NULL) + if (epname != NULL && *epname) { MirVer.AppendFormat(" [%s]", epname); } -- cgit v1.2.3