summaryrefslogtreecommitdiff
path: root/protocols/Skype/src/skype_chat.h
diff options
context:
space:
mode:
authorAlexander Lantsev <aunsane@gmail.com>2013-06-14 18:26:29 +0000
committerAlexander Lantsev <aunsane@gmail.com>2013-06-14 18:26:29 +0000
commit0043f79996b6bf582194fd45d42d86ca2816292f (patch)
tree083bb550630bc245210e8609e96e2bdec4a4bfc9 /protocols/Skype/src/skype_chat.h
parent19130f846c811022b5a765162f4a146f1362727d (diff)
Skype:
- fixed chat creating/removing - fixed chat inviting - fixed #367 git-svn-id: http://svn.miranda-ng.org/main/trunk@4945 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'protocols/Skype/src/skype_chat.h')
-rw-r--r--protocols/Skype/src/skype_chat.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/protocols/Skype/src/skype_chat.h b/protocols/Skype/src/skype_chat.h
index c2d0fa80b9..7b1dcd0bf2 100644
--- a/protocols/Skype/src/skype_chat.h
+++ b/protocols/Skype/src/skype_chat.h
@@ -137,10 +137,10 @@ private:
ChatRoom(const wchar_t *cid);
- HANDLE AddChatRoom();
-
inline static int CompareMembers(const ChatMember *p1, const ChatMember *p2) { return ChatMember::Compare(p1, p2); }
+ void CreateChatSession(bool showWindow = false);
+
bool IsMe(const ChatMember &item) const;
bool IsSys(const ChatMember &item) const;
void SendEvent(const ChatMember &item, int eventType, DWORD timestamp = time(NULL), DWORD flags = GCEF_ADDTOLOG, DWORD itemData = 0, const wchar_t *status = NULL, const wchar_t *message = NULL);
@@ -157,8 +157,9 @@ public:
ChatRoom(const wchar_t *cid, const wchar_t *name, CSkypeProto *ppro);
~ChatRoom();
- void Start(bool showWindow = false);
- void Start(const ParticipantRefs &participants, bool showWindow = false);
+ static void Create(const StringList &invitedMembers, CSkypeProto *ppro, bool showWindow = false);
+
+ void Start(const ConversationRef &conversation, bool showWindow = false);
void LeaveChat();
@@ -185,6 +186,5 @@ public:
void OnParticipantChanged(const ParticipantRef &participant, int prop);
- static int __cdecl OnGCEventHook(WPARAM, LPARAM lParam);
- static int __cdecl OnGCMenuHook(WPARAM, LPARAM lParam);
+ static ChatRoom *FindChatRoom(const wchar_t *cid);
}; \ No newline at end of file