diff options
| author | MikalaiR <nikolay.romanovich@narod.ru> | 2015-04-18 14:31:06 +0000 |
|---|---|---|
| committer | MikalaiR <nikolay.romanovich@narod.ru> | 2015-04-18 14:31:06 +0000 |
| commit | 0d9ca51da67752273947ae853b1cfc923e407627 (patch) | |
| tree | 437ec80361a3682c5f54b4465d865b2300164f46 /protocols/SkypeWeb/src/skype_history_sync.cpp | |
| parent | 54f4449e9183407bd8cd09fdcb81f4e3d55ac3e5 (diff) | |
SkypeWeb: Chats history loading fix.
git-svn-id: http://svn.miranda-ng.org/main/trunk@12912 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'protocols/SkypeWeb/src/skype_history_sync.cpp')
| -rw-r--r-- | protocols/SkypeWeb/src/skype_history_sync.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/protocols/SkypeWeb/src/skype_history_sync.cpp b/protocols/SkypeWeb/src/skype_history_sync.cpp index 7c4bf07034..228b1be561 100644 --- a/protocols/SkypeWeb/src/skype_history_sync.cpp +++ b/protocols/SkypeWeb/src/skype_history_sync.cpp @@ -93,7 +93,7 @@ void CSkypeProto::OnGetServerHistory(const NETLIBHTTPREQUEST *response) {
if (!mir_strcmpi(messageType, "Text") || !mir_strcmpi(messageType, "RichText"))
{
- ptrA chatname(ContactUrlToName(conversationLink));
+ ptrA chatname(ChatUrlToName(conversationLink));
GCDEST gcd = { m_szModuleName, ptrT(mir_a2t(chatname)), GC_EVENT_MESSAGE };
GCEVENT gce = { sizeof(GCEVENT), &gcd };
gce.bIsMe = IsMe(ContactUrlToName(from));
@@ -140,7 +140,7 @@ void CSkypeProto::OnSyncHistory(const NETLIBHTTPREQUEST *response) {
JSONNODE *conversation = json_at(conversations, i);
JSONNODE *lastMessage = json_get(conversation, "lastMessage");
- if (lastMessage == NULL)
+ if (json_empty(lastMessage))
continue;
char *clientMsgId = mir_t2a(json_as_string(json_get(lastMessage, "clientmessageid")));
|