summaryrefslogtreecommitdiff
path: root/protocols
diff options
context:
space:
mode:
authorSergey Bolhovskoy <elzorfox@ya.ru>2016-06-30 03:55:28 +0000
committerSergey Bolhovskoy <elzorfox@ya.ru>2016-06-30 03:55:28 +0000
commit8b5c9ad399a7cdb1c8b4986d4289f7b2a87248c2 (patch)
tree249ba2442752ad6b11b95a534175517fa110845f /protocols
parentb63e6266c23a782d0e5661111f350986aca7f3ff (diff)
VKontakte: small fixes
git-svn-id: http://svn.miranda-ng.org/main/trunk@17050 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'protocols')
-rw-r--r--protocols/VKontakte/src/vk_history.cpp2
-rw-r--r--protocols/VKontakte/src/vk_struct.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/protocols/VKontakte/src/vk_history.cpp b/protocols/VKontakte/src/vk_history.cpp
index 2331176ab0..505b20ca54 100644
--- a/protocols/VKontakte/src/vk_history.cpp
+++ b/protocols/VKontakte/src/vk_history.cpp
@@ -189,7 +189,7 @@ void CVkProto::OnReceiveHistoryMessages(NETLIBHTTPREQUEST *reply, AsyncHttpReque
m_iLoadHistoryTask--;
ptrT ptszNick(db_get_tsa(param->hContact, m_szModuleName, "Nick"));
- CMString str(FORMAT, _T("%s for %s"), TranslateT("Error loading message history from server"), ptszNick);
+ CMString str(FORMAT, _T("%s %s %s"), TranslateT("Error loading message history from server"), TranslateT("for"), ptszNick);
MsgPopup(param->hContact, str, TranslateT("Error"), true);
debugLog(_T("CVkProto::OnReceiveHistoryMessages error for %s m_iLoadHistoryTask=%d"), ptszNick, m_iLoadHistoryTask);
diff --git a/protocols/VKontakte/src/vk_struct.cpp b/protocols/VKontakte/src/vk_struct.cpp
index f5f4493a48..59c354325a 100644
--- a/protocols/VKontakte/src/vk_struct.cpp
+++ b/protocols/VKontakte/src/vk_struct.cpp
@@ -42,7 +42,7 @@ AsyncHttpRequest::AsyncHttpRequest(CVkProto *ppro, int iRequestType, LPCSTR _url
cbSize = sizeof(NETLIBHTTPREQUEST);
m_bApiReq = true;
bIsMainConn = false;
- bExpUrlEncode = ppro->m_vkOptions.bUseNonStandardUrlEncode != 0 ? true : false;
+ bExpUrlEncode = (BYTE)ppro->m_vkOptions.bUseNonStandardUrlEncode != 0;
AddHeader("Connection", "keep-alive");
if (*_url == '/') { // relative url leads to a site