From 116c762e508fef30be544a9e07a2f89b33b481f6 Mon Sep 17 00:00:00 2001 From: Sergey Bolhovskoy Date: Thu, 29 Oct 2015 04:44:31 +0000 Subject: VKontakte: fix for news notification in clist fix option dialog labels code cleaning git-svn-id: http://svn.miranda-ng.org/main/trunk@15645 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- protocols/VKontakte/src/vk_proto.h | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) (limited to 'protocols/VKontakte/src/vk_proto.h') diff --git a/protocols/VKontakte/src/vk_proto.h b/protocols/VKontakte/src/vk_proto.h index d6a7902d6d..3422e066f6 100644 --- a/protocols/VKontakte/src/vk_proto.h +++ b/protocols/VKontakte/src/vk_proto.h @@ -81,7 +81,7 @@ struct CVkProto : public PROTO void OnOAuthAuthorize(NETLIBHTTPREQUEST*, AsyncHttpRequest*); void OnReceiveAvatar(NETLIBHTTPREQUEST*, AsyncHttpRequest*); - + //==== Services ====================================================================== INT_PTR __cdecl SvcCreateAccMgrUI(WPARAM, LPARAM); @@ -141,26 +141,26 @@ struct CVkProto : public PROTO void OnReciveUploadServer(NETLIBHTTPREQUEST*, AsyncHttpRequest*); void OnReciveUpload(NETLIBHTTPREQUEST*, AsyncHttpRequest*); void OnReciveUploadFile(NETLIBHTTPREQUEST*, AsyncHttpRequest*); - + //==== Feed ========================================================================== void AddFeedSpecialUser(); void AddFeedEvent(CVKNewsItem& vkNewsItem); void AddCListEvent(bool bNews); - + CVkUserInfo* GetVkUserInfo(LONG iUserId, OBJLIST &vkUsers); void CreateVkUserInfoList(OBJLIST &vkUsers, const JSONNode &jnResponse); - + CVKNewsItem* GetVkNewsItem(const JSONNode &jnItem, OBJLIST &vkUsers, bool isRepost = false); CVKNewsItem* GetVkGroupInvates(const JSONNode &jnItem, OBJLIST &vkUsers); CVKNewsItem* GetVkNotificationsItem(const JSONNode &jnItem, OBJLIST &vkUsers); CMString GetVkFeedback(const JSONNode &jnFeedback, VKObjType vkFeedbackType, OBJLIST &vkUsers, CVkUserInfo *vkUser); CVKNewsItem* GetVkParent(const JSONNode &jnParent, VKObjType vkParentType, LPCTSTR ptszReplyText = NULL, LPCTSTR ptszReplyLink = NULL); - + void RetrieveUnreadNews(time_t tLastNewsTime); void OnReceiveUnreadNews(NETLIBHTTPREQUEST*, AsyncHttpRequest*); - + void RetrieveUnreadNotifications(time_t tLastNotificationsTime); bool FilterNotification(CVKNewsItem* vkNotificationItem, bool& isCommented); void NotificationMarkAsViewed(); @@ -174,7 +174,7 @@ struct CVkProto : public PROTO TCHAR* GetUserStoredPassword(void); void SetAllContactStatuses(int status); - + MCONTACT FindUser(LONG userid, bool bCreate = false); MCONTACT FindChat(LONG dwUserid); @@ -328,7 +328,7 @@ private: }; OBJLIST m_cookies; - + void InitQueue(); void UninitQueue(); void ExecuteRequest(AsyncHttpRequest*); @@ -351,7 +351,6 @@ private: void __cdecl SendMsgAck(void *param); //============== Options ============================================================= - bool m_prevError, m_bOnline, @@ -403,10 +402,10 @@ private: enum MarkMsgReadOn { markOnRead, markOnReceive, markOnReply, markOnTyping }; MarkMsgReadOn m_iMarkMessageReadOn; - + enum SyncHistoryMetod { syncOff, syncAuto, sync1Days, sync3Days }; SyncHistoryMetod m_iSyncHistoryMetod; - + enum MusicSendMetod { sendNone, sendStatusOnly, sendBroadcastOnly, sendBroadcastAndStatus }; MusicSendMetod m_iMusicSendMetod; @@ -431,9 +430,9 @@ private: m_hPollingThread, m_hPopupClassError, m_hPopupClassNotification; - + ULONG m_msgId; - + LIST m_sendIds; LIST m_incIds; -- cgit v1.2.3