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.cpp | 78 ------------------------------- 1 file changed, 78 deletions(-) delete mode 100644 protocols/Skype/src/skypekit/skypekit.cpp (limited to 'protocols/Skype/src/skypekit/skypekit.cpp') diff --git a/protocols/Skype/src/skypekit/skypekit.cpp b/protocols/Skype/src/skypekit/skypekit.cpp deleted file mode 100644 index d06f505969..0000000000 --- a/protocols/Skype/src/skypekit/skypekit.cpp +++ /dev/null @@ -1,78 +0,0 @@ -#include "skypekit.h" - -CSkype::CSkype(int num_threads) : Skype(num_threads) -{ - this->proto = NULL; - this->onMessagedCallback = NULL; -} - -CAccount* CSkype::newAccount(int oid) -{ - return new CAccount(oid, this); -} - -CContactGroup* CSkype::newContactGroup(int oid) -{ - return new CContactGroup(oid, this); -} - -CContact* CSkype::newContact(int oid) -{ - return new CContact(oid, this); -} - -CConversation* CSkype::newConversation(int oid) -{ - return new CConversation(oid, this); -} - -CParticipant* CSkype::newParticipant(int oid) -{ - return new CParticipant(oid, this); -} - -CMessage* CSkype::newMessage(int oid) -{ - return new CMessage(oid, this); -} - -CTransfer* CSkype::newTransfer(int oid) -{ - return new CTransfer(oid, this); -} - -CContactSearch* CSkype::newContactSearch(int oid) -{ - return new CContactSearch(oid, this); -} - -bool CSkype::CreateConferenceWithConsumers(ConversationRef &conference, const SEStringList &identities) -{ - if (this->CreateConference(conference)) - { - conference->SetOption(CConversation::P_OPT_JOINING_ENABLED, true); - conference->SetOption(CConversation::P_OPT_ENTRY_LEVEL_RANK, CParticipant::WRITER); - conference->SetOption(CConversation::P_OPT_DISCLOSE_HISTORY, 1); - conference->AddConsumers(identities); - - return true; - } - - return false; -} - -void CSkype::SetOnMessageCallback(OnMessaged callback, CSkypeProto* proto) -{ - this->proto = proto; - this->onMessagedCallback = callback; -} - -void CSkype::OnMessage ( - const MessageRef & message, - const bool & changesInboxTimestamp, - const MessageRef & supersedesHistoryMessage, - const ConversationRef & conversation) -{ - if (this->proto && this->onMessagedCallback) - (proto->*onMessagedCallback)(conversation, message); -} -- cgit v1.2.3