diff options
| author | MikalaiR <nikolay.romanovich@narod.ru> | 2015-05-23 12:56:36 +0000 |
|---|---|---|
| committer | MikalaiR <nikolay.romanovich@narod.ru> | 2015-05-23 12:56:36 +0000 |
| commit | b09cd0eea16d71ce0d7d36bc7481e51b7bf431b3 (patch) | |
| tree | 3a7c59376fcce14d4cebb16594acc1d707063f3b | |
| parent | d136d0ccb00bb6b0f7ec42388afa9ef07094abf5 (diff) | |
SkypeWeb: Not add "[]" to MirVer. Warning fix.
git-svn-id: http://svn.miranda-ng.org/main/trunk@13771 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
| -rw-r--r-- | protocols/SkypeWeb/src/skype_history_sync.cpp | 3 | ||||
| -rw-r--r-- | protocols/SkypeWeb/src/skype_poll_processing.cpp | 2 |
2 files changed, 2 insertions, 3 deletions
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);
}
|