summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--protocols/VKontakte/src/vk_proto.cpp1
-rw-r--r--protocols/VKontakte/src/vk_proto.h3
-rw-r--r--protocols/VKontakte/src/vk_thread.cpp4
3 files changed, 5 insertions, 3 deletions
diff --git a/protocols/VKontakte/src/vk_proto.cpp b/protocols/VKontakte/src/vk_proto.cpp
index daa371839d..cdd9f4e37a 100644
--- a/protocols/VKontakte/src/vk_proto.cpp
+++ b/protocols/VKontakte/src/vk_proto.cpp
@@ -73,6 +73,7 @@ CVkProto::CVkProto(const char *szModuleName, const TCHAR *ptszUserName) :
m_bClearServerHistory = getBool("ClearServerHistoryOnBanUser", false);
m_bRemoveFromFrendlist = getBool("RemoveFromFrendlistOnBanUser", false);
m_bRemoveFromClist = getBool("RemoveFromClistOnBanUser", false);
+ m_bPopUpSyncHistory = getBool("PopUpSyncHistory", false);
// Set all contacts offline -- in case we crashed
SetAllContactStatuses(ID_STATUS_OFFLINE);
diff --git a/protocols/VKontakte/src/vk_proto.h b/protocols/VKontakte/src/vk_proto.h
index 4c2256a1d8..0964b2a7e3 100644
--- a/protocols/VKontakte/src/vk_proto.h
+++ b/protocols/VKontakte/src/vk_proto.h
@@ -406,7 +406,8 @@ private:
m_bReportAbuse,
m_bClearServerHistory,
m_bRemoveFromFrendlist,
- m_bRemoveFromClist;
+ m_bRemoveFromClist,
+ m_bPopUpSyncHistory;
LONG m_myUserId;
ptrT m_defaultGroup;
diff --git a/protocols/VKontakte/src/vk_thread.cpp b/protocols/VKontakte/src/vk_thread.cpp
index 77a7857223..1205137f90 100644
--- a/protocols/VKontakte/src/vk_thread.cpp
+++ b/protocols/VKontakte/src/vk_thread.cpp
@@ -609,7 +609,7 @@ void CVkProto::OnReceiveDlgs(NETLIBHTTPREQUEST *reply, AsyncHttpRequest *pReq)
if (pDlgs == NULL)
return;
- if (m_bAutoSyncHistory)
+ if (m_bAutoSyncHistory&&m_bPopUpSyncHistory)
MsgPopup(NULL, TranslateT("Start sync history"), TranslateT("Sync history"));
for (int i = 0; i < numDlgs; i++) {
JSONNODE *pDlg = json_at(pDlgs, i);
@@ -653,7 +653,7 @@ void CVkProto::OnReceiveDlgs(NETLIBHTTPREQUEST *reply, AsyncHttpRequest *pReq)
MarkMessagesRead(hContact);
}
}
- if (m_bAutoSyncHistory)
+ if (m_bAutoSyncHistory&&m_bPopUpSyncHistory)
MsgPopup(NULL, TranslateT("Sync history complete"), TranslateT("Sync history"));
RetrieveUsersInfo();
}