- reworked message receiving/sending (by another instance)

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

1 files changed, 10 insertions, 4 deletions

diff --git a/protocols/Skype/src/skype_proto.h b/protocols/Skype/src/skype_proto.h
index f7a057a306..8a5eae3498 100644
--- a/protocols/Skype/src/skype_proto.h
+++ b/protocols/Skype/src/skype_proto.h
@@ -157,8 +157,8 @@ protected:
 	bool	IsOnline();

 	void	OnAccountChanged(int prop);

 

-	wchar_t	*login;

-	char *password;

+	char	*login;

+	char	*password;

 	bool	rememberPassword;

 	void	RequestPassword();

 

@@ -170,8 +170,9 @@ protected:
 	static LanguagesListEntry languages[223];

 

 	// messages

-	void	OnMessageReceived(CMessage::Ref message);

-	void	OnConversationAdded(CConversation::Ref conversation);

+	void	OnMessage(CConversation::Ref conversation, CMessage::Ref message);

+	void	OnMessageSended(CConversation::Ref conversation, CMessage::Ref message);

+	void	OnMessageReceived(CConversation::Ref conversation, CMessage::Ref message);

 

 	// contacts

 	void	UpdateContactAboutText(HANDLE hContact, CContact::Ref contact);

@@ -302,6 +303,11 @@ protected:
 		const char* sid, 

 		const char* nick, 

 		const char* message = "");

+	void RaiseMessageSendedEvent(

+		DWORD timestamp, 

+		const char* sid, 

+		const char* nick, 

+		const char* message = "");

 	void RaiseAuthRequestEvent(

 		DWORD timestamp, 

 		const char* sid,