summaryrefslogtreecommitdiff
path: root/protocols
diff options
context:
space:
mode:
authorSergey Bolhovskoy <elzorfox@ya.ru>2015-07-17 15:33:34 +0000
committerSergey Bolhovskoy <elzorfox@ya.ru>2015-07-17 15:33:34 +0000
commitf608fc32971bf88987899eb3ebde2bbda7e42c87 (patch)
tree3551105a0761649953ba36c5affb1213944ab4b8 /protocols
parentc598987f83e50e0b678e89cd507a5a284a18b62a (diff)
VKontakte:
add ‘chat_photo_remove’ muc action fix mark as read on read when metacontacts is enable git-svn-id: http://svn.miranda-ng.org/main/trunk@14581 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'protocols')
-rw-r--r--protocols/VKontakte/src/vk_chats.cpp2
-rw-r--r--protocols/VKontakte/src/vk_messages.cpp3
2 files changed, 4 insertions, 1 deletions
diff --git a/protocols/VKontakte/src/vk_chats.cpp b/protocols/VKontakte/src/vk_chats.cpp
index 8016f5a6f9..8519dfe2a8 100644
--- a/protocols/VKontakte/src/vk_chats.cpp
+++ b/protocols/VKontakte/src/vk_chats.cpp
@@ -377,6 +377,8 @@ void CVkProto::AppendChatMessage(int id, const JSONNode &jnMsg, bool bIsHistory)
}
else if (tszAction == _T("chat_photo_update"))
tszBody.Replace(TranslateT("Attachments:"), TranslateT("changed chat cover:"));
+ else if (tszAction == _T("chat_photo_remove"))
+ tszBody = TranslateT("deleted chat cover");
else
tszBody.AppendFormat(_T(": %s (%s)"), TranslateT("chat action not supported"), tszAction);
}
diff --git a/protocols/VKontakte/src/vk_messages.cpp b/protocols/VKontakte/src/vk_messages.cpp
index a8970be976..182b0a18de 100644
--- a/protocols/VKontakte/src/vk_messages.cpp
+++ b/protocols/VKontakte/src/vk_messages.cpp
@@ -123,9 +123,10 @@ void CVkProto::OnSendMessage(NETLIBHTTPREQUEST *reply, AsyncHttpRequest *pReq)
/////////////////////////////////////////////////////////////////////////////////////////
-int CVkProto::OnDbEventRead(WPARAM hContact, LPARAM)
+int CVkProto::OnDbEventRead(WPARAM, LPARAM hDbEvent)
{
debugLogA("CVkProto::OnDbEventRead");
+ MCONTACT hContact = db_event_getContact(hDbEvent);
if (!hContact)
return 0;