VKontakte: add 'ShowVkDeactivateEvents' hidden option (default true)

3 files changed, 5 insertions, 1 deletions

diff --git a/protocols/VKontakte/src/misc.cpp b/protocols/VKontakte/src/misc.cpp
index d078df244c..f22b9452ac 100644
--- a/protocols/VKontakte/src/misc.cpp
+++ b/protocols/VKontakte/src/misc.cpp
@@ -1455,6 +1455,8 @@ void CVkProto::ShowCaptchaInBrowser(HBITMAP hBitmap)
 

 void CVkProto::AddVkDeactivateEvent(MCONTACT hContact, CMStringW&  wszType)

 {

+	debugLogW(L"CVkProto::AddVkDeactivateEvent hContact=%d, wszType=%s bShowVkDeactivateEvents=%d", hContact, wszType, (int)m_vkOptions.bShowVkDeactivateEvents);

+

 	CVKDeactivateEvent vkDeactivateEvent[] = {

 		{ L"", Translate("User restored control over own page") },

 		{ L"deleted", Translate("User was deactivated (deleted)") },

@@ -1478,7 +1480,7 @@ void CVkProto::AddVkDeactivateEvent(MCONTACT hContact, CMStringW&  wszType)
 	dbei.eventType = VK_USER_DEACTIVATE_ACTION;

 	dbei.cbBlob = mir_strlen(vkDeactivateEvent[iDEIdx].szDescription) + 1;

 	dbei.pBlob = (PBYTE)mir_strdup(vkDeactivateEvent[iDEIdx].szDescription);

-	dbei.flags = DBEF_UTF;

+	dbei.flags = DBEF_UTF | (m_vkOptions.bShowVkDeactivateEvents ? 0 : DBEF_READ);

 	db_event_add(hContact, &dbei);

 }

 

diff --git a/protocols/VKontakte/src/vk_struct.cpp b/protocols/VKontakte/src/vk_struct.cpp
index 8373f8be89..a3bbd939a1 100644
--- a/protocols/VKontakte/src/vk_struct.cpp
+++ b/protocols/VKontakte/src/vk_struct.cpp
@@ -212,6 +212,7 @@ CVKOptions::CVKOptions(PROTO_INTERFACE *proto) :
 	bSplitFormatFwdMsg(proto, "SplitFormatFwdMsg", true),

 	bSyncReadMessageStatusFromServer(proto, "SyncReadMessageStatusFromServer", false),

 	bLoadFullCList(proto, "LoadFullCList", false),

+	bShowVkDeactivateEvents(proto, "ShowVkDeactivateEvens", true),

 

 	bShowProtoMenuItem0(proto, "ShowProtoMenuItem0", true), 

 	bShowProtoMenuItem1(proto, "ShowProtoMenuItem1", true),

diff --git a/protocols/VKontakte/src/vk_struct.h b/protocols/VKontakte/src/vk_struct.h
index a17d056278..b37dbc0f6d 100644
--- a/protocols/VKontakte/src/vk_struct.h
+++ b/protocols/VKontakte/src/vk_struct.h
@@ -336,6 +336,7 @@ struct CVKOptions {
 	CMOption<BYTE> bLoadFullCList;

 	CMOption<BYTE> bSendVKLinksAsAttachments;

 	CMOption<BYTE> bLoadSentAttachments;

+	CMOption<BYTE> bShowVkDeactivateEvents;

 

 	CMOption<BYTE> bShowProtoMenuItem0;

 	CMOption<BYTE> bShowProtoMenuItem1;