From 0123928144819659b3753ed375a5d559458f023d Mon Sep 17 00:00:00 2001 From: Sergey Bolhovskoy Date: Thu, 16 Oct 2014 10:18:11 +0000 Subject: VKontakte: change processing error 9 remove dead code git-svn-id: http://svn.miranda-ng.org/main/trunk@10796 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- protocols/VKontakte/src/misc.cpp | 3 ++- protocols/VKontakte/src/vk_thread.cpp | 10 +--------- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/protocols/VKontakte/src/misc.cpp b/protocols/VKontakte/src/misc.cpp index 9e69a3a29d..866ea48068 100644 --- a/protocols/VKontakte/src/misc.cpp +++ b/protocols/VKontakte/src/misc.cpp @@ -137,9 +137,10 @@ bool CVkProto::CheckJsonResult(AsyncHttpRequest *pReq, NETLIBHTTPREQUEST *reply, if (fup) fup->iErrorCode = iErrorCode; break; + case VKERR_FLOOD_CONTROL: + pReq->m_iRetry = 0; case VKERR_UNKNOWN: case VKERR_TOO_MANY_REQ_PER_SEC: - case VKERR_FLOOD_CONTROL: case VKERR_INTERNAL_SERVER_ERR: if (pReq->m_iRetry > 0){ pReq->bNeedsRestart = true; diff --git a/protocols/VKontakte/src/vk_thread.cpp b/protocols/VKontakte/src/vk_thread.cpp index fe75ca477c..d6bcf02c31 100644 --- a/protocols/VKontakte/src/vk_thread.cpp +++ b/protocols/VKontakte/src/vk_thread.cpp @@ -577,15 +577,7 @@ void CVkProto::OnReceiveMessages(NETLIBHTTPREQUEST *reply, AsyncHttpRequest *pRe int action_mid = _ttoi(json_as_string(json_get(pMsg, "action_mid"))); if ((action_chat == "chat_kick_user") && (action_mid == m_myUserId)) KickFromChat(chat_id, uid, pMsg); - else if ((action_chat == "chat_invite_user") && (action_mid == m_myUserId)){ - MCONTACT chatContact = FindChat(chat_id); - if (chatContact){ - db_unset(chatContact, m_szModuleName, "kicked"); - db_unset(chatContact, m_szModuleName, "off"); - } - AppendChatMessage(chat_id, pMsg, false); - } - else + else AppendChatMessage(chat_id, pMsg, false); continue; } -- cgit v1.2.3