diff options
| author | Sergey Bolhovskoy <elzorfox@ya.ru> | 2015-08-11 12:40:42 +0000 |
|---|---|---|
| committer | Sergey Bolhovskoy <elzorfox@ya.ru> | 2015-08-11 12:40:42 +0000 |
| commit | 222802c2986dcaf029fdfb828b7679bdabfa7bb2 (patch) | |
| tree | 6c832c0c61543d1dbf07690f4ff1c407094a78ca /protocols/VKontakte | |
| parent | ed855d57a87bb5a5588bf499f40900a7c19ea13c (diff) | |
update vk api version to 5.36
fix muc join logic
version bump
git-svn-id: http://svn.miranda-ng.org/main/trunk@14909 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'protocols/VKontakte')
| -rw-r--r-- | protocols/VKontakte/src/version.h | 2 | ||||
| -rw-r--r-- | protocols/VKontakte/src/vk.h | 2 | ||||
| -rw-r--r-- | protocols/VKontakte/src/vk_chats.cpp | 5 |
3 files changed, 6 insertions, 3 deletions
diff --git a/protocols/VKontakte/src/version.h b/protocols/VKontakte/src/version.h index d047aab448..2765e7a603 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 1
-#define __BUILD_NUM 10
+#define __BUILD_NUM 11
#include <stdver.h>
diff --git a/protocols/VKontakte/src/vk.h b/protocols/VKontakte/src/vk.h index a2f67a1d52..f19d71b582 100644 --- a/protocols/VKontakte/src/vk.h +++ b/protocols/VKontakte/src/vk.h @@ -67,7 +67,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define VKERR_INVALID_FILENAME 301 // Invalid filename
#define VKERR_INVALID_FILESIZE 302 // Invalid filesize
-#define VK_API_VER "5.35"
+#define VK_API_VER "5.36"
#define VER_API CHAR_PARAM("v", VK_API_VER)
#define VK_FEED_USER 2147483647L
diff --git a/protocols/VKontakte/src/vk_chats.cpp b/protocols/VKontakte/src/vk_chats.cpp index b5dfbba7d8..1f2968364e 100644 --- a/protocols/VKontakte/src/vk_chats.cpp +++ b/protocols/VKontakte/src/vk_chats.cpp @@ -145,7 +145,7 @@ void CVkProto::OnReceiveChatInfo(NETLIBHTTPREQUEST *reply, AsyncHttpRequest *pRe SetChatTitle(cc, jnInfo["title"].as_mstring());
if (jnInfo["left"].as_bool() || jnInfo["kicked"].as_bool()) {
- setByte(cc->m_hContact, "kicked", (int)true);
+ setByte(cc->m_hContact, "kicked", jnInfo["kicked"].as_bool());
LeaveChat(cc->m_chatid);
return;
}
@@ -644,6 +644,9 @@ INT_PTR __cdecl CVkProto::OnJoinChat(WPARAM hContact, LPARAM) if (getBool(hContact, "kicked"))
return 1;
+ if (!getBool(hContact, "off"))
+ return 1;
+
int chat_id = getDword(hContact, "vk_chat_id", -1);
if (chat_id == -1)
|