VKontakte:

fix #4808 (remove unneeded option)
version bump

10 files changed, 3 insertions, 24 deletions

diff --git a/protocols/VKontakte/res/resource.rc b/protocols/VKontakte/res/resource.rc
index 2166e944e4..7fca7574e9 100644
--- a/protocols/VKontakte/res/resource.rc
+++ b/protocols/VKontakte/res/resource.rc
@@ -193,17 +193,15 @@ BEGIN
     CONTROL         "basic ([b], [i], [u], [s])",IDC_ATTBBC_BASIC,"Button",BS_AUTORADIOBUTTON,21,139,129,10

     CONTROL         "advanced (+[url], [size], [color], [code])",IDC_ATTBBC_ADV,

                     "Button",BS_AUTORADIOBUTTON,134,128,149,10

-    GROUPBOX        "Other",IDC_STATIC,4,156,294,69

+    GROUPBOX        "Other",IDC_STATIC,4,156,294,58

     CONTROL         "Process stickers as smileys",IDC_STICKERS_AS_SMYLES,

                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,165,278,10

     CONTROL         "Shorten links for audio attachments",IDC_SHOTEN_LINKS_FOR_AUDIO,

                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,176,278,10

     CONTROL         "Use non-standard popups for news and event notifications",IDC_USENOSTDPOPUPS,

                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,187,278,10

-    CONTROL         "Add message link to messages with attachments",IDC_ADD_MES_LINK_MES_ATT,

-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,198,278,10

     CONTROL         "Add original message version in edited message",IDC_ADD_ORIG_VER_IN_EDITED_MES,

-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,209,278,10

+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,198,278,10

 END

 

 IDD_OPT_FEEDS DIALOGEX 0, 0, 304, 232

diff --git a/protocols/VKontakte/src/resource.h b/protocols/VKontakte/src/resource.h
index 9870d88810..b80d89af36 100644
--- a/protocols/VKontakte/src/resource.h
+++ b/protocols/VKontakte/src/resource.h
@@ -130,7 +130,6 @@
 #define IDC_MESSAGE                     1117

 #define IDC_STATIC_MARKCONTAKTS         1118

 #define IDC_STATIC_MESSAGE              1120

-#define IDC_ADD_MES_LINK_MES_ATT        1121

 #define IDC_ADD_ORIG_VER_IN_EDITED_MES  1122

 #define IDC_IMG_300                     1123

 

diff --git a/protocols/VKontakte/src/version.h b/protocols/VKontakte/src/version.h
index 559175551c..d06a5cb1d2 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            17

-#define __BUILD_NUM              2

+#define __BUILD_NUM              3

 

 #include <stdver.h>

 

diff --git a/protocols/VKontakte/src/vk_chats.cpp b/protocols/VKontakte/src/vk_chats.cpp
index 68ada0350f..57f4109d68 100644
--- a/protocols/VKontakte/src/vk_chats.cpp
+++ b/protocols/VKontakte/src/vk_chats.cpp
@@ -442,11 +442,6 @@ void CVkProto::AppendChatConversationMessage(VKUserID_t iChatId, const JSONNode&
 		}

 	}

 

-	if (m_vkOptions.bAddMessageLinkToMesWAtt && ((jnAttachments && !jnAttachments.empty()) || (jnFwdMessages && !jnFwdMessages.empty()) || (jnReplyMessages && !jnReplyMessages.empty() && m_vkOptions.bShowReplyInMessage)))

-		wszBody += SetBBCString(TranslateT("Message link"), m_vkOptions.bBBCNewStorySupport ? bbcAdvanced : bbcNo, vkbbcUrl,

-			CMStringW(FORMAT, L"https://vk.com/im?sel=c%d&msgid=%d", vkChatInfo->m_iChatId, iMessageId));

-	

-

 	if (jnMsg["action"] && jnMsg["action"]["type"]) {

 		bIsAction = true;

 		CMStringW wszAction = jnMsg["action"]["type"].as_mstring();

diff --git a/protocols/VKontakte/src/vk_history.cpp b/protocols/VKontakte/src/vk_history.cpp
index 93a1fcb25f..daadf2a968 100644
--- a/protocols/VKontakte/src/vk_history.cpp
+++ b/protocols/VKontakte/src/vk_history.cpp
@@ -297,10 +297,6 @@ void CVkProto::OnReceiveHistoryMessages(MHttpResponse *reply, AsyncHttpRequest *
 			wszBody += wszAttachmentDescr;

 		}

 

-		if (m_vkOptions.bAddMessageLinkToMesWAtt && ((jnAttachments && !jnAttachments.empty()) || (jnFwdMessages && !jnFwdMessages.empty()) || (jnReplyMessages && !jnReplyMessages.empty() && m_vkOptions.bShowReplyInMessage)))

-			wszBody += SetBBCString(TranslateT("Message link"), m_vkOptions.BBCForAttachments(), vkbbcUrl,

-				CMStringW(FORMAT, L"https://vk.com/im?sel=%d&msgid=%d", iUserId, iMessageId));

-

 		DB::EventInfo dbei;

 		if (bIsRead)

 			dbei.flags |= DBEF_READ;

diff --git a/protocols/VKontakte/src/vk_messages.cpp b/protocols/VKontakte/src/vk_messages.cpp
index c8dfc43834..f55ba92ccd 100644
--- a/protocols/VKontakte/src/vk_messages.cpp
+++ b/protocols/VKontakte/src/vk_messages.cpp
@@ -454,10 +454,6 @@ void CVkProto::OnReceiveMessages(MHttpResponse *reply, AsyncHttpRequest *pReq)
 			wszBody += wszAttachmentDescr;

 		}

 

-		if (m_vkOptions.bAddMessageLinkToMesWAtt && ((jnAttachments && !jnAttachments.empty()) || (jnFwdMessages && !jnFwdMessages.empty()) || (jnReplyMessages && !jnReplyMessages.empty() && m_vkOptions.bShowReplyInMessage)))

-			wszBody += SetBBCString(TranslateT("Message link"), m_vkOptions.BBCForAttachments(), vkbbcUrl,

-				CMStringW(FORMAT, L"https://vk.com/im?sel=%d&msgid=%d", iUserId, iMessageId));

-

 		VKMessageID_t iReadMsg = ReadQSWord(hContact, "in_read", 0);

 		bool bIsRead = (iMessageId <= iReadMsg);

 

diff --git a/protocols/VKontakte/src/vk_options.cpp b/protocols/VKontakte/src/vk_options.cpp
index 82a6617084..fe76ae36ff 100644
--- a/protocols/VKontakte/src/vk_options.cpp
+++ b/protocols/VKontakte/src/vk_options.cpp
@@ -446,7 +446,6 @@ CVkOptionViewForm::CVkOptionViewForm(CVkProto *proto) :
 	m_cbBBCForAttachmentsAdvanced(this, IDC_ATTBBC_ADV),

 	m_cbStikersAsSmyles(this, IDC_STICKERS_AS_SMYLES),

 	m_cbShortenLinksForAudio(this, IDC_SHOTEN_LINKS_FOR_AUDIO),

-	m_cbAddMessageLinkToMesWAtt(this, IDC_ADD_MES_LINK_MES_ATT),

 	m_cbUseNonStandardNotifications(this, IDC_USENOSTDPOPUPS),

 	m_cbShowBeforeEditedPostVersion(this, IDC_ADD_ORIG_VER_IN_EDITED_MES)

 {

@@ -454,7 +453,6 @@ CVkOptionViewForm::CVkOptionViewForm(CVkProto *proto) :
 	CreateLink(m_cbUseBBCOnAttacmentsAsNews, m_proto->m_vkOptions.bUseBBCOnAttacmentsAsNews);

 	CreateLink(m_cbStikersAsSmyles, m_proto->m_vkOptions.bStikersAsSmileys);

 	CreateLink(m_cbShortenLinksForAudio, m_proto->m_vkOptions.bShortenLinksForAudio);

-	CreateLink(m_cbAddMessageLinkToMesWAtt, m_proto->m_vkOptions.bAddMessageLinkToMesWAtt);

 	CreateLink(m_cbUseNonStandardNotifications, m_proto->m_vkOptions.bUseNonStandardNotifications);

 	CreateLink(m_cbShowBeforeEditedPostVersion, m_proto->m_vkOptions.bShowBeforeEditedPostVersion);

 

diff --git a/protocols/VKontakte/src/vk_options.h b/protocols/VKontakte/src/vk_options.h
index 3ac837ef48..6117262bb4 100644
--- a/protocols/VKontakte/src/vk_options.h
+++ b/protocols/VKontakte/src/vk_options.h
@@ -148,7 +148,6 @@ class CVkOptionViewForm : public CVkDlgBase
 

 	CCtrlCheck m_cbStikersAsSmyles;

 	CCtrlCheck m_cbShortenLinksForAudio;

-	CCtrlCheck m_cbAddMessageLinkToMesWAtt;

 	CCtrlCheck m_cbUseNonStandardNotifications;

 	CCtrlCheck m_cbShowBeforeEditedPostVersion;

 

diff --git a/protocols/VKontakte/src/vk_struct.cpp b/protocols/VKontakte/src/vk_struct.cpp
index 5f68846d32..d4c1da7fca 100644
--- a/protocols/VKontakte/src/vk_struct.cpp
+++ b/protocols/VKontakte/src/vk_struct.cpp
@@ -200,7 +200,6 @@ CVKOptions::CVKOptions(PROTO_INTERFACE* proto) :
 	bLoadSentAttachments(proto, "LoadSentAttachments", bSendVKLinksAsAttachments),

 	bUseNonStandardNotifications(proto, "UseNonStandardNotifications", false),

 	bShortenLinksForAudio(proto, "ShortenLinksForAudio", true),

-	bAddMessageLinkToMesWAtt(proto, "AddMessageLinkToMesWAtt", true),

 	bShowReplyInMessage(proto, "ShowReplyInMessage", false),

 	bSplitFormatFwdMsg(proto, "SplitFormatFwdMsg", false),

 	bSyncReadMessageStatusFromServer(proto, "SyncReadMessageStatusFromServer", false),

diff --git a/protocols/VKontakte/src/vk_struct.h b/protocols/VKontakte/src/vk_struct.h
index be5f146002..8ac8558b86 100644
--- a/protocols/VKontakte/src/vk_struct.h
+++ b/protocols/VKontakte/src/vk_struct.h
@@ -301,7 +301,6 @@ struct CVKOptions {
 	CMOption<uint8_t> bNotificationFilterAcceptedFriends;

 	CMOption<uint8_t> bUseNonStandardNotifications;

 	CMOption<uint8_t> bShortenLinksForAudio;

-	CMOption<uint8_t> bAddMessageLinkToMesWAtt;

 	CMOption<uint8_t> bShowReplyInMessage;

 	CMOption<uint8_t> bSplitFormatFwdMsg;

 	CMOption<uint8_t> bSyncReadMessageStatusFromServer;