From 2a1e6f05aa9fcc4dfe642bd42aeb175e3958d4b3 Mon Sep 17 00:00:00 2001 From: Alexander Lantsev Date: Mon, 13 May 2013 18:30:05 +0000 Subject: Merged revision(s) from branches/unsane/skype_test: - CSkypeProto is derived of Skype class now - chat events moved to skype_chat.cpp - fixed chat message timestamp - fixed #331, #332 git-svn-id: http://svn.miranda-ng.org/main/trunk@4644 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- protocols/Skype/src/skypekit/skypekit.h | 43 --------------------------------- 1 file changed, 43 deletions(-) delete mode 100644 protocols/Skype/src/skypekit/skypekit.h (limited to 'protocols/Skype/src/skypekit/skypekit.h') diff --git a/protocols/Skype/src/skypekit/skypekit.h b/protocols/Skype/src/skypekit/skypekit.h deleted file mode 100644 index 3f1d7b1e58..0000000000 --- a/protocols/Skype/src/skypekit/skypekit.h +++ /dev/null @@ -1,43 +0,0 @@ -#pragma once - -#include "common.h" - -#include "group.h" -#include "search.h" -#include "account.h" -#include "contact.h" -#include "message.h" -#include "transfer.h" -#include "participant.h" -#include "conversation.h" - -class CSkype : public Skype -{ -public: - typedef void (CSkypeProto::* OnMessaged)(CConversation::Ref conversation, CMessage::Ref message); - - CAccount* newAccount(int oid); - CContactGroup* newContactGroup(int oid); - CConversation* newConversation(int oid); - CContactSearch* newContactSearch(int oid); - CParticipant* newParticipant(int oid); - CContact* newContact(int oid); - CMessage* newMessage(int oid); - CTransfer* newTransfer(int oid); - - CSkype(int num_threads = 1); - - void SetOnMessageCallback(OnMessaged callback, CSkypeProto* proto); - - bool CreateConferenceWithConsumers(ConversationRef &conference, const SEStringList &identities); - -private: - CSkypeProto* proto; - OnMessaged onMessagedCallback; - - void OnMessage( - const MessageRef & message, - const bool & changesInboxTimestamp, - const MessageRef & supersedesHistoryMessage, - const ConversationRef & conversation); -}; \ No newline at end of file -- cgit v1.2.3