diff options
| author | Alexander Lantsev <aunsane@gmail.com> | 2013-06-19 20:13:00 +0000 |
|---|---|---|
| committer | Alexander Lantsev <aunsane@gmail.com> | 2013-06-19 20:13:00 +0000 |
| commit | 119f9233647a964c46be1c0bc0cf2829361a688e (patch) | |
| tree | 4e08e9f569c54284acef57755daaebb5d5de2565 /protocols/Skype/src/skypekit | |
| parent | bdfdc655113dba220c066ac1de5998697006cb44 (diff) | |
Skype:
- added bookmarks for chat rooms (contact menu, srmm button bar, bookmark list window)
- added "ignore command" for contact
- added "block command" for contact (contact removed from clist and ignored)
- changed icons
git-svn-id: http://svn.miranda-ng.org/main/trunk@5047 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'protocols/Skype/src/skypekit')
| -rw-r--r-- | protocols/Skype/src/skypekit/conversation.cpp | 13 | ||||
| -rw-r--r-- | protocols/Skype/src/skypekit/conversation.h | 11 | ||||
| -rw-r--r-- | protocols/Skype/src/skypekit/participant.cpp | 13 | ||||
| -rw-r--r-- | protocols/Skype/src/skypekit/participant.h | 7 |
4 files changed, 37 insertions, 7 deletions
diff --git a/protocols/Skype/src/skypekit/conversation.cpp b/protocols/Skype/src/skypekit/conversation.cpp index 3aa6fe39f2..ff393c8efb 100644 --- a/protocols/Skype/src/skypekit/conversation.cpp +++ b/protocols/Skype/src/skypekit/conversation.cpp @@ -1,7 +1,20 @@ #include "..\skype.h"
#include "conversation.h"
+#include "..\skype_chat.h"
CConversation::CConversation(unsigned int oid, SERootObject* root) :
Conversation(oid, root)
{
+ this->room = NULL;
}
+
+void CConversation::SetChatRoom(ChatRoom *room)
+{
+ this->room = room;
+}
+
+void CConversation::OnChange(int prop)
+{
+ if (this->room != NULL)
+ this->room->OnChange(this->ref(), prop);
+}
\ No newline at end of file diff --git a/protocols/Skype/src/skypekit/conversation.h b/protocols/Skype/src/skypekit/conversation.h index e8631dcac8..3441743328 100644 --- a/protocols/Skype/src/skypekit/conversation.h +++ b/protocols/Skype/src/skypekit/conversation.h @@ -2,13 +2,22 @@ #include "common.h"
+class ChatRoom;
+
class CConversation : public Conversation
{
public:
- typedef void (CSkypeProto::* OnConvoChanged)(const ConversationRef &conversation, int);
+ //typedef void (CSkypeProto::* OnConvoChanged)(const ConversationRef &conversation, int);
typedef DRef<CConversation, Conversation> Ref;
typedef DRefs<CConversation, Conversation> Refs;
CConversation(unsigned int oid, SERootObject* root);
+
+ void SetChatRoom(ChatRoom *room);
+
+private:
+ ChatRoom *room;
+
+ void OnChange(int prop);
};
\ No newline at end of file diff --git a/protocols/Skype/src/skypekit/participant.cpp b/protocols/Skype/src/skypekit/participant.cpp index 513f532a0f..41e183821b 100644 --- a/protocols/Skype/src/skypekit/participant.cpp +++ b/protocols/Skype/src/skypekit/participant.cpp @@ -1,5 +1,6 @@ #include "..\skype.h"
#include "participant.h"
+#include "..\skype_chat.h"
CParticipant::CParticipant(unsigned int oid, SERootObject* root) :
Participant(oid, root)
@@ -7,14 +8,20 @@ CParticipant::CParticipant(unsigned int oid, SERootObject* root) : this->room = NULL;
}
-void CParticipant::SetOnChangedCallback(OnChanged callback, ChatRoom *room)
+//void CParticipant::SetOnChangedCallback(OnChanged callback, ChatRoom *room)
+//{
+// this->room = room;
+// this->callback = callback;
+//}
+
+void CParticipant::SetChatRoom(ChatRoom *room)
{
this->room = room;
- this->callback = callback;
}
void CParticipant::OnChange(int prop)
{
if (this->room != NULL)
- (room->*callback)(this->ref(), prop);
+ this->room->OnParticipantChanged(this->ref(), prop);
+ //(room->*callback)(this->ref(), prop);
}
\ No newline at end of file diff --git a/protocols/Skype/src/skypekit/participant.h b/protocols/Skype/src/skypekit/participant.h index e6db40ca1f..170c14f1b7 100644 --- a/protocols/Skype/src/skypekit/participant.h +++ b/protocols/Skype/src/skypekit/participant.h @@ -7,18 +7,19 @@ class ChatRoom; class CParticipant : public Participant
{
public:
- typedef void (ChatRoom::* OnChanged)(const ParticipantRef &participant, int);
+ //typedef void (ChatRoom::* OnChanged)(const ParticipantRef &participant, int);
typedef DRef<CParticipant, Participant> Ref;
typedef DRefs<CParticipant, Participant> Refs;
CParticipant(unsigned int oid, SERootObject* root);
- void SetOnChangedCallback(OnChanged callback, ChatRoom *room);
+ //void SetOnChangedCallback(OnChanged callback, ChatRoom *room);
+ void SetChatRoom(ChatRoom *room);
private:
ChatRoom *room;
- OnChanged callback;
+ //OnChanged callback;
void OnChange(int prop);
};
\ No newline at end of file |