diff options
| author | Sergey Bolhovskoy <elzorfox@ya.ru> | 2014-10-16 04:15:50 +0000 |
|---|---|---|
| committer | Sergey Bolhovskoy <elzorfox@ya.ru> | 2014-10-16 04:15:50 +0000 |
| commit | f71c05fadaa38b0719f75d8ba5fc26ea230b478e (patch) | |
| tree | bbd5fc89fef6493aeada49c20ea04c6c93991aae | |
| parent | 52c089ce70ecf928b51369ad339bcd8d3576ccbe (diff) | |
VKontakte:
fix for kick from chat
version bump
git-svn-id: http://svn.miranda-ng.org/main/trunk@10794 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
| -rw-r--r-- | protocols/VKontakte/src/version.h | 2 | ||||
| -rw-r--r-- | protocols/VKontakte/src/vk_chats.cpp | 2 | ||||
| -rw-r--r-- | protocols/VKontakte/src/vk_thread.cpp | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/protocols/VKontakte/src/version.h b/protocols/VKontakte/src/version.h index 6c02e3140a..52b96e62a7 100644 --- a/protocols/VKontakte/src/version.h +++ b/protocols/VKontakte/src/version.h @@ -1,7 +1,7 @@ #define __MAJOR_VERSION 0
#define __MINOR_VERSION 1
#define __RELEASE_NUM 0
-#define __BUILD_NUM 22
+#define __BUILD_NUM 23
#include <stdver.h>
diff --git a/protocols/VKontakte/src/vk_chats.cpp b/protocols/VKontakte/src/vk_chats.cpp index e29b3f57f2..2854fcbf1b 100644 --- a/protocols/VKontakte/src/vk_chats.cpp +++ b/protocols/VKontakte/src/vk_chats.cpp @@ -550,7 +550,7 @@ void CVkProto::KickFromChat(int chat_id, int user_id, JSONNODE* pMsg) AppendChatMessage(chat_id, pMsg, false);
MsgPopup(hContact, msg, TranslateT("Chat"));
- LeaveChat(chat_id, false);
+ LeaveChat(chat_id);
}
void CVkProto::OnChatLeave(NETLIBHTTPREQUEST *reply, AsyncHttpRequest *pReq)
diff --git a/protocols/VKontakte/src/vk_thread.cpp b/protocols/VKontakte/src/vk_thread.cpp index d0dacb36df..4089e27ed0 100644 --- a/protocols/VKontakte/src/vk_thread.cpp +++ b/protocols/VKontakte/src/vk_thread.cpp @@ -575,8 +575,8 @@ void CVkProto::OnReceiveMessages(NETLIBHTTPREQUEST *reply, AsyncHttpRequest *pRe if (chat_id != 0) {
CMString action_chat = json_as_string(json_get(pMsg, "action"));
CMString action_mid = json_as_string(json_get(pMsg, "action_mid"));
- if (action_chat == "chat_kick_user")
- KickFromChat(chat_id, _ttoi(action_mid.GetBuffer()), pMsg);
+ if ((action_chat == "chat_kick_user") && (_ttoi(action_mid.GetBuffer()) == m_myUserId))
+ KickFromChat(chat_id, uid, pMsg);
else
AppendChatMessage(chat_id, pMsg, false);
continue;
|