Skype: messagging refactoring

git-svn-id: http://svn.miranda-ng.org/main/trunk@12746 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

1 files changed, 7 insertions, 5 deletions

diff --git a/protocols/SkypeWeb/src/skype_proto.h b/protocols/SkypeWeb/src/skype_proto.h
index 1c5492c4e4..74b9868ec4 100644
--- a/protocols/SkypeWeb/src/skype_proto.h
+++ b/protocols/SkypeWeb/src/skype_proto.h
@@ -194,10 +194,9 @@ private:
 	void OnReceiveAvatar(const NETLIBHTTPREQUEST *response, void *arg);

 	void OnSentAvatar(const NETLIBHTTPREQUEST *response);

 

-	void CSkypeProto::OnSearch(const NETLIBHTTPREQUEST *response);

-

-	MCONTACT GetContact(const char *skypename);

+	void OnSearch(const NETLIBHTTPREQUEST *response);

 

+	MCONTACT FindContact(const char *skypename);

 	MCONTACT AddContact(const char *skypename, bool isTemporary = false);

 

 	MCONTACT GetContactFromAuthEvent(MEVENT hEvent);

@@ -224,13 +223,16 @@ private:
 	int OnSendMessage(MCONTACT hContact, int flags, const char *message);

 	void OnMessageSent(const NETLIBHTTPREQUEST *response, void *arg);

 	int __cdecl OnPreCreateMessage(WPARAM, LPARAM lParam);

-	//History sync

+

+	void OnPrivateMessageEvent(JSONNODE *node);

+

+	// sync

 	void OnGetServerHistory(const NETLIBHTTPREQUEST *response);

 	void SyncHistory();

 	void OnSyncHistory(const NETLIBHTTPREQUEST *response);

 

 	//chats

-	MCONTACT GetChat(const char *skypename);

+	MCONTACT FindChatRoom(const char *skypename);

 	MCONTACT AddChatRoom(const char *chatname);

 	void SetChatStatus(MCONTACT hContact, int iStatus);