diff options
| author | Alexander Lantsev <aunsane@gmail.com> | 2013-06-04 19:29:50 +0000 |
|---|---|---|
| committer | Alexander Lantsev <aunsane@gmail.com> | 2013-06-04 19:29:50 +0000 |
| commit | 7cf93849b55a578640195e58427f33d3254bc562 (patch) | |
| tree | 557ffbb15a7ae3221524c1c2a60dcfe36c661ab0 /protocols/Skype/src/skype_chat.h | |
| parent | 5054e65a8e37c122ee249765f01ee0ece223ec5d (diff) | |
Skype:
- fixed messaging in chats
- fixed incoming transfer status (probably fixed #358)
- fixed #357
git-svn-id: http://svn.miranda-ng.org/main/trunk@4884 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'protocols/Skype/src/skype_chat.h')
| -rw-r--r-- | protocols/Skype/src/skype_chat.h | 24 |
1 files changed, 2 insertions, 22 deletions
diff --git a/protocols/Skype/src/skype_chat.h b/protocols/Skype/src/skype_chat.h index d12cc3fa72..134823e343 100644 --- a/protocols/Skype/src/skype_chat.h +++ b/protocols/Skype/src/skype_chat.h @@ -80,9 +80,6 @@ private: inline static int CompareMembers(const ChatMember *p1, const ChatMember *p2) { return ::lstrcmpi(p1->sid, p2->sid); }
- static int __cdecl OnGCEventHook(WPARAM, LPARAM lParam);
- static int __cdecl OnGCMenuHook(WPARAM, LPARAM lParam);
-
void AddMember(ChatMember *member, DWORD timestamp, int flag);
public:
@@ -97,8 +94,6 @@ public: void SendEvent(ChatMember *member, int eventType, DWORD timestamp = time(NULL), DWORD flags = GCEF_ADDTOLOG, DWORD itemData = 0, const wchar_t *status = NULL, const wchar_t *message = NULL);
void SendEvent(const wchar_t *sid, int eventType, DWORD timestamp = time(NULL), DWORD flags = GCEF_ADDTOLOG, DWORD itemData = 0, const wchar_t *status = NULL, const wchar_t *message = NULL);
- void AppendMessage(const wchar_t *sid, const wchar_t *message, DWORD timestamp = time(NULL), int eventType = GC_EVENT_MESSAGE);
-
bool IsMe(const wchar_t *sid) const;
bool IsMe(ChatMember *member) const;
@@ -117,22 +112,7 @@ public: void RemoveMember(const wchar_t *sid, DWORD timestamp = time(NULL));
void OnEvent(const ConversationRef &conversation, const MessageRef &message);
-};
-class ChatList
-{
-private:
- CSkypeProto *ppro;
- LIST<ChatRoom> chatRooms;
-
- inline static int CompareChatRooms(const ChatRoom* p1, const ChatRoom* p2) { return ::lstrcmpi(p1->cid, p2->cid); }
-
-public:
- ChatList(CSkypeProto *ppro);
- ~ChatList();
-
- ChatRoom *FindChatRoom(ChatRoom *item);
- ChatRoom *FindChatRoom(const wchar_t *cid);
-
- HANDLE AddChatRoom(ChatRoom *item);
+ static int __cdecl OnGCEventHook(WPARAM, LPARAM lParam);
+ static int __cdecl OnGCMenuHook(WPARAM, LPARAM lParam);
};
\ No newline at end of file |