From 8bafe41c028c4419072938d19ed6e390d8947978 Mon Sep 17 00:00:00 2001 From: Sergey Bolhovskoy Date: Thu, 11 Sep 2014 06:19:04 +0000 Subject: VKontakte: remove MyHtmlDecode cosmetic fix version bump git-svn-id: http://svn.miranda-ng.org/main/trunk@10428 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- protocols/VKontakte/src/misc.cpp | 9 --------- protocols/VKontakte/src/version.h | 2 +- protocols/VKontakte/src/vk_proto.h | 2 +- protocols/VKontakte/src/vk_thread.cpp | 4 ++-- 4 files changed, 4 insertions(+), 13 deletions(-) (limited to 'protocols/VKontakte/src') diff --git a/protocols/VKontakte/src/misc.cpp b/protocols/VKontakte/src/misc.cpp index 9ce00e1d04..d7f678a29a 100644 --- a/protocols/VKontakte/src/misc.cpp +++ b/protocols/VKontakte/src/misc.cpp @@ -109,15 +109,6 @@ void CVkProto::OnReceiveSmth(NETLIBHTTPREQUEST *reply, AsyncHttpRequest *pReq) CheckJsonResponse(pReq, reply, pRoot); } -void MyHtmlDecode(CMStringW &str) -{ - str.Replace(_T("
"), _T("\n")); - str.Replace(_T("&"), _T("&")); - str.Replace(_T("&pos;"), _T("\'")); - str.Replace(_T(">"), _T(">")); - str.Replace(_T("<"), _T("<")); - str.Replace(_T("""), _T("\"")); -} ///////////////////////////////////////////////////////////////////////////////////////// diff --git a/protocols/VKontakte/src/version.h b/protocols/VKontakte/src/version.h index c5f142ecb8..e5fba6e23a 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 12 +#define __BUILD_NUM 13 #include diff --git a/protocols/VKontakte/src/vk_proto.h b/protocols/VKontakte/src/vk_proto.h index 38509f42d6..aa5497f93d 100644 --- a/protocols/VKontakte/src/vk_proto.h +++ b/protocols/VKontakte/src/vk_proto.h @@ -200,7 +200,7 @@ struct CVkProto : public PROTO void OnReceiveMyInfo(NETLIBHTTPREQUEST*, AsyncHttpRequest*); void RetrieveUserInfo(LONG userId); - void RetrieveUsersInfo(int flag = 0); + void RetrieveUsersInfo(bool flag = false); void OnReceiveUserInfo(NETLIBHTTPREQUEST*, AsyncHttpRequest*); void RetrieveFriends(); diff --git a/protocols/VKontakte/src/vk_thread.cpp b/protocols/VKontakte/src/vk_thread.cpp index 6766ec5ab6..da26a7649c 100644 --- a/protocols/VKontakte/src/vk_thread.cpp +++ b/protocols/VKontakte/src/vk_thread.cpp @@ -44,7 +44,7 @@ static VOID CALLBACK TimerProc(HWND, UINT, UINT_PTR, DWORD) { for (int i = 0; i < vk_Instances.getCount(); i++){ vk_Instances[i]->SetServerStatus(vk_Instances[i]->m_iStatus); - vk_Instances[i]->RetrieveUsersInfo(1); + vk_Instances[i]->RetrieveUsersInfo(true); } } @@ -241,7 +241,7 @@ void CVkProto::RetrieveUserInfo(LONG userID) << VER_API); } -void CVkProto::RetrieveUsersInfo(int flag) +void CVkProto::RetrieveUsersInfo(bool flag) { CMStringA userIDs; for (MCONTACT hContact = db_find_first(m_szModuleName); hContact; hContact = db_find_next(hContact, m_szModuleName)){ -- cgit v1.2.3