diff options
Diffstat (limited to 'protocols/VKontakte/src')
| -rw-r--r-- | protocols/VKontakte/src/resource.h | 1 | ||||
| -rw-r--r-- | protocols/VKontakte/src/version.h | 2 | ||||
| -rw-r--r-- | protocols/VKontakte/src/vk_messages.cpp | 8 | ||||
| -rw-r--r-- | protocols/VKontakte/src/vk_options.cpp | 2 | ||||
| -rw-r--r-- | protocols/VKontakte/src/vk_options.h | 1 | ||||
| -rw-r--r-- | protocols/VKontakte/src/vk_struct.cpp | 1 | ||||
| -rw-r--r-- | protocols/VKontakte/src/vk_struct.h | 1 |
7 files changed, 2 insertions, 14 deletions
diff --git a/protocols/VKontakte/src/resource.h b/protocols/VKontakte/src/resource.h index 4f3d4fa917..9870d88810 100644 --- a/protocols/VKontakte/src/resource.h +++ b/protocols/VKontakte/src/resource.h @@ -37,7 +37,6 @@ #define IDC_FRAME1 1008
#define IDC_FRAME2 1009
#define IDC_SUBMIT 1010
-#define IDC_DELIVERY 1011
#define IDC_GROUPNAME 1012
#define IDC_HIDECHATS 1014
#define IDC_CONTACT 1015
diff --git a/protocols/VKontakte/src/version.h b/protocols/VKontakte/src/version.h index 20c56b9a6a..559175551c 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 1
+#define __BUILD_NUM 2
#include <stdver.h>
diff --git a/protocols/VKontakte/src/vk_messages.cpp b/protocols/VKontakte/src/vk_messages.cpp index 7d14a6305c..c8dfc43834 100644 --- a/protocols/VKontakte/src/vk_messages.cpp +++ b/protocols/VKontakte/src/vk_messages.cpp @@ -129,9 +129,6 @@ int CVkProto::ForwardMsg(MCONTACT hContact, std::vector<MEVENT>& vForvardEvents, pReq->pUserInfo = new CVkSendMsgParam(hContact, uMsgId);
Push(pReq);
- if (!m_vkOptions.bServerDelivery)
- ProtoBroadcastAsync(hContact, ACKTYPE_MESSAGE, ACKRESULT_SUCCESS, (HANDLE)uMsgId);
-
if (vForvardEvents.size() > VK_MAX_FORWARD_MESSAGES) {
std::vector vNextForvardEvents(vForvardEvents.begin() + VK_MAX_FORWARD_MESSAGES, vForvardEvents.end());
ForwardMsg(hContact, vNextForvardEvents, "");
@@ -210,9 +207,6 @@ int CVkProto::SendMsg(MCONTACT hContact, MEVENT hReplyEvent, const char *szMsg) pReq->pUserInfo = new CVkSendMsgParam(hContact, uMsgId);
Push(pReq);
- if (!m_vkOptions.bServerDelivery)
- ProtoBroadcastAsync(hContact, ACKTYPE_MESSAGE, ACKRESULT_SUCCESS, (HANDLE)uMsgId);
-
if (!IsEmpty(pszRetMsg))
SendMsg(hContact, 0, pszRetMsg);
else if (m_iStatus == ID_STATUS_INVISIBLE)
@@ -272,7 +266,7 @@ void CVkProto::OnSendMessage(MHttpResponse *reply, AsyncHttpRequest *pReq) if (!pReq->bNeedsRestart || m_bTerminated)
delete param->pFUP;
}
- else if (m_vkOptions.bServerDelivery)
+ else
ProtoBroadcastAck(param->hContact, ACKTYPE_MESSAGE, iResult, (HANDLE)(param->iMsgID), (LPARAM)szMid);
diff --git a/protocols/VKontakte/src/vk_options.cpp b/protocols/VKontakte/src/vk_options.cpp index 3f993f2b64..82a6617084 100644 --- a/protocols/VKontakte/src/vk_options.cpp +++ b/protocols/VKontakte/src/vk_options.cpp @@ -165,7 +165,6 @@ CVkOptionAccountForm::CVkOptionAccountForm(CVkProto *proto) : m_hlLink(this, IDC_URL, "https://vk.com/"),
m_edtGroupName(this, IDC_GROUPNAME),
m_cbxVKLang(this, IDC_COMBO_LANGUAGE),
- m_cbDelivery(this, IDC_DELIVERY),
m_cbLoadLastMessageOnMsgWindowsOpen(this, IDC_LASTHISTORYLOAD),
m_cbUseLocalTime(this, IDC_USE_LOCAL_TIME),
m_cbLoadOnlyFriends(this, IDC_LOADONLYFRIENDS),
@@ -174,7 +173,6 @@ CVkOptionAccountForm::CVkOptionAccountForm(CVkProto *proto) : {
CreateLink(m_edtLogin, "Login", L"");
CreateLink(m_edtGroupName, m_proto->m_vkOptions.pwszDefaultGroup);
- CreateLink(m_cbDelivery, m_proto->m_vkOptions.bServerDelivery);
CreateLink(m_cbLoadLastMessageOnMsgWindowsOpen, m_proto->m_vkOptions.bLoadLastMessageOnMsgWindowsOpen);
CreateLink(m_cbUseLocalTime, m_proto->m_vkOptions.bUseLocalTime);
CreateLink(m_cbLoadOnlyFriends, m_proto->m_vkOptions.bLoadOnlyFriends);
diff --git a/protocols/VKontakte/src/vk_options.h b/protocols/VKontakte/src/vk_options.h index 7ffb0c1be0..3ac837ef48 100644 --- a/protocols/VKontakte/src/vk_options.h +++ b/protocols/VKontakte/src/vk_options.h @@ -29,7 +29,6 @@ class CVkOptionAccountForm : public CVkDlgBase CCtrlHyperlink m_hlLink;
CCtrlEdit m_edtGroupName;
CCtrlCombo m_cbxVKLang;
- CCtrlCheck m_cbDelivery;
CCtrlCheck m_cbLoadLastMessageOnMsgWindowsOpen;
CCtrlCheck m_cbUseLocalTime;
CCtrlCheck m_cbLoadOnlyFriends;
diff --git a/protocols/VKontakte/src/vk_struct.cpp b/protocols/VKontakte/src/vk_struct.cpp index a17eef2d4b..5f68846d32 100644 --- a/protocols/VKontakte/src/vk_struct.cpp +++ b/protocols/VKontakte/src/vk_struct.cpp @@ -160,7 +160,6 @@ CVkChatUser* CVkChatInfo::GetUserById(VKUserID_t iUserId) CVKOptions::CVKOptions(PROTO_INTERFACE* proto) :
bLoadLastMessageOnMsgWindowsOpen(proto, "LoadLastMessageOnMsgWindowsOpen", true),
bLoadOnlyFriends(proto, "LoadOnlyFriends", false),
- bServerDelivery(proto, "BsDirect", true),
bHideChats(proto, "HideChats", true),
bMesAsUnread(proto, "MesAsUnread", false),
bUseLocalTime(proto, "UseLocalTime", false),
diff --git a/protocols/VKontakte/src/vk_struct.h b/protocols/VKontakte/src/vk_struct.h index 8dce08e013..be5f146002 100644 --- a/protocols/VKontakte/src/vk_struct.h +++ b/protocols/VKontakte/src/vk_struct.h @@ -254,7 +254,6 @@ struct CVkCookie struct CVKOptions {
CMOption<uint8_t> bLoadLastMessageOnMsgWindowsOpen;
CMOption<uint8_t> bLoadOnlyFriends;
- CMOption<uint8_t> bServerDelivery;
CMOption<uint8_t> bHideChats;
CMOption<uint8_t> bMesAsUnread;
CMOption<uint8_t> bUseLocalTime;
|