- reworked invitation to chat

- fixed chat contact's statuses
- added "Spawn conversation" button in contact dialog
- StringList now based on stl


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

4 files changed, 24 insertions, 24 deletions

diff --git a/protocols/Skype/src/skypekit/conversation.cpp b/protocols/Skype/src/skypekit/conversation.cpp
index 2b0e26ad80..3c56e57559 100644
--- a/protocols/Skype/src/skypekit/conversation.cpp
+++ b/protocols/Skype/src/skypekit/conversation.cpp
@@ -1,13 +1,3 @@
 #include "conversation.h"

 

-CConversation::CConversation(unsigned int oid, SERootObject* root) : Conversation(oid, root)

-{

-	this->GetParticipants(this->participants, CConversation::OTHER_CONSUMERS);

-	fetch(this->participants);

-}

-

-void CConversation::OnParticipantListChange()

-{

-	this->GetParticipants(this->participants, CConversation::OTHER_CONSUMERS);

-	fetch(this->participants);

-}

+CConversation::CConversation(unsigned int oid, SERootObject* root) : Conversation(oid, root) { }
\ No newline at end of file
diff --git a/protocols/Skype/src/skypekit/conversation.h b/protocols/Skype/src/skypekit/conversation.h
index 26e7fb990b..2527ced564 100644
--- a/protocols/Skype/src/skypekit/conversation.h
+++ b/protocols/Skype/src/skypekit/conversation.h
@@ -1,7 +1,6 @@
 #pragma once

 

 #include "common.h"

-#include "participant.h"

 

 class CConversation : public Conversation

 {

@@ -10,10 +9,4 @@ public:
 	typedef DRefs<CConversation, Conversation> Refs;

 

 	CConversation(unsigned int oid, SERootObject* root);

-

-private:

-	CSkypeProto* proto;

-	CParticipant::Refs participants;

-

-	void OnParticipantListChange();

 };
\ No newline at end of file
diff --git a/protocols/Skype/src/skypekit/skypekit.cpp b/protocols/Skype/src/skypekit/skypekit.cpp
index 6b5b77a238..233b7b0535 100644
--- a/protocols/Skype/src/skypekit/skypekit.cpp
+++ b/protocols/Skype/src/skypekit/skypekit.cpp
@@ -46,6 +46,27 @@ 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,

@@ -54,10 +75,4 @@ void CSkype::OnMessage (
 {

 	if (this->proto)

 		(proto->*onMessagedCallback)(conversation, message);

-}

-

-void CSkype::SetOnMessageCallback(OnMessaged callback, CSkypeProto* proto)

-{

-	this->proto = proto;

-	this->onMessagedCallback = callback;

 }
\ No newline at end of file
diff --git a/protocols/Skype/src/skypekit/skypekit.h b/protocols/Skype/src/skypekit/skypekit.h
index faac4f3d65..3f1d7b1e58 100644
--- a/protocols/Skype/src/skypekit/skypekit.h
+++ b/protocols/Skype/src/skypekit/skypekit.h
@@ -29,6 +29,8 @@ public:
 

 	void SetOnMessageCallback(OnMessaged callback, CSkypeProto* proto);

 

+	bool CreateConferenceWithConsumers(ConversationRef &conference, const SEStringList &identities);

+

 private:

 	CSkypeProto*	proto;

 	OnMessaged		onMessagedCallback;