summaryrefslogtreecommitdiff
path: root/protocols/Skype/src/skype_subclassing.h
diff options
context:
space:
mode:
Diffstat (limited to 'protocols/Skype/src/skype_subclassing.h')
-rw-r--r--protocols/Skype/src/skype_subclassing.h16
1 files changed, 4 insertions, 12 deletions
diff --git a/protocols/Skype/src/skype_subclassing.h b/protocols/Skype/src/skype_subclassing.h
index 0840c57dc3..2624ba3f76 100644
--- a/protocols/Skype/src/skype_subclassing.h
+++ b/protocols/Skype/src/skype_subclassing.h
@@ -125,8 +125,7 @@ private:
class CSkype : public Skype
{
public:
- typedef void (CSkypeProto::* OnMessageReceived)(CMessage::Ref message);
- typedef void (CSkypeProto::* OnConversationAdded)(CConversation::Ref conversation);
+ typedef void (CSkypeProto::* OnMessaged)(CConversation::Ref conversation, CMessage::Ref message);
CAccount* newAccount(int oid);
CContactGroup* newContactGroup(int oid);
@@ -139,22 +138,15 @@ public:
CSkype(int num_threads = 1);
- void SetOnMessageReceivedCallback(OnMessageReceived callback, CSkypeProto* proto);
- void SetOnConversationAddedCallback(OnConversationAdded callback, CSkypeProto* proto);
+ void SetOnMessageCallback(OnMessaged callback, CSkypeProto* proto);
private:
- CSkypeProto* proto;
- OnMessageReceived onMessageReceivedCallback;
- OnConversationAdded onConversationAddedCallback;
+ CSkypeProto* proto;
+ OnMessaged onMessagedCallback;
void OnMessage(
const MessageRef & message,
const bool & changesInboxTimestamp,
const MessageRef & supersedesHistoryMessage,
const ConversationRef & conversation);
-
- void OnConversationListChange(
- const ConversationRef &conversation,
- const Conversation::LIST_TYPE &type,
- const bool &added);
}; \ No newline at end of file