fixes #2616 (support for stickers & file transfers in ICQ)

1 files changed, 31 insertions, 30 deletions

diff --git a/protocols/ICQ-WIM/src/proto.h b/protocols/ICQ-WIM/src/proto.h
index 9bfb80c4a5..14527204fa 100644
--- a/protocols/ICQ-WIM/src/proto.h
+++ b/protocols/ICQ-WIM/src/proto.h
@@ -247,37 +247,38 @@ class CIcqProto : public PROTO<CIcqProto>
 
 	friend AsyncHttpRequest* operator <<(AsyncHttpRequest*, const AIMSID&);
 
-	bool      m_bOnline, m_bTerminated, m_bFirstBos;
-	int       m_iTimeShift;
-
-	MCONTACT  CheckOwnMessage(const CMStringA &reqId, const CMStringA &msgId, bool bRemove);
-	void      CheckPassword(void);
-	void      ConnectionFailed(int iReason, int iErrorCode = 0);
-	void      EmailNotification(const wchar_t *pwszText);
-	void      GetPermitDeny();
-	wchar_t*  GetUIN(MCONTACT hContact);
-	void      MarkAsRead(MCONTACT hContact);
-	void      MoveContactToGroup(MCONTACT hContact, const wchar_t *pwszGroup, const wchar_t *pwszNewGroup);
-	bool      RetrievePassword();
-	void      RetrieveUserHistory(MCONTACT, __int64 startMsgId, bool bCreateRead);
-	void      RetrieveUserInfo(MCONTACT = INVALID_CONTACT_ID);
-	void      SetServerStatus(int iNewStatus);
-	void      ShutdownSession(void);
-	void      StartSession(void);
-
-	void      CheckAvatarChange(MCONTACT hContact, const JSONNode&);
-	void      CheckLastId(MCONTACT hContact, const JSONNode&);
-	void      Json2int(MCONTACT, const JSONNode&, const char *szJson, const char *szSetting);
-	void      Json2string(MCONTACT, const JSONNode&, const char *szJson, const char *szSetting);
-	MCONTACT  ParseBuddyInfo(const JSONNode &buddy, MCONTACT hContact = -1);
-	void      ParseMessage(MCONTACT hContact, __int64 &lastMsgId, const JSONNode &msg, bool bCreateRead, bool bLocalTime);
-
-	void      OnLoggedIn(void);
-	void      OnLoggedOut(void);
-
-	mir_cs    m_csMarkReadQueue;
+	bool         m_bOnline, m_bTerminated, m_bFirstBos;
+	int          m_iTimeShift;
+				    
+	MCONTACT     CheckOwnMessage(const CMStringA &reqId, const CMStringA &msgId, bool bRemove);
+	void         CheckPassword(void);
+	void         ConnectionFailed(int iReason, int iErrorCode = 0);
+	void         EmailNotification(const wchar_t *pwszText);
+	void         GetPermitDeny();
+	wchar_t*     GetUIN(MCONTACT hContact);
+	void         MarkAsRead(MCONTACT hContact);
+	void         MoveContactToGroup(MCONTACT hContact, const wchar_t *pwszGroup, const wchar_t *pwszNewGroup);
+	bool         RetrievePassword();
+	void         RetrieveUserHistory(MCONTACT, __int64 startMsgId, bool bCreateRead);
+	void         RetrieveUserInfo(MCONTACT = INVALID_CONTACT_ID);
+	void         SetServerStatus(int iNewStatus);
+	void         ShutdownSession(void);
+	void         StartSession(void);
+				    
+	void         CheckAvatarChange(MCONTACT hContact, const JSONNode&);
+	IcqFileInfo* CheckFile(MCONTACT hContact, CMStringW &wszFileName, bool &bIsFile);
+	void         CheckLastId(MCONTACT hContact, const JSONNode&);
+	void         Json2int(MCONTACT, const JSONNode&, const char *szJson, const char *szSetting);
+	void         Json2string(MCONTACT, const JSONNode&, const char *szJson, const char *szSetting);
+	MCONTACT     ParseBuddyInfo(const JSONNode &buddy, MCONTACT hContact = -1);
+	void         ParseMessage(MCONTACT hContact, __int64 &lastMsgId, const JSONNode &msg, bool bCreateRead, bool bLocalTime);
+				    
+	void         OnLoggedIn(void);
+	void         OnLoggedOut(void);
+
+	mir_cs       m_csMarkReadQueue;
 	LIST<IcqCacheItem> m_arMarkReadQueue;
-	void      SendMarkRead();
+	void         SendMarkRead();
 
 	AsyncHttpRequest* UserInfoRequest(MCONTACT);