diff options
| author | Alexander Lantsev <aunsane@gmail.com> | 2013-06-15 09:55:44 +0000 |
|---|---|---|
| committer | Alexander Lantsev <aunsane@gmail.com> | 2013-06-15 09:55:44 +0000 |
| commit | e3b5f750733bbbe9cdd5cb8292ca6938ae8b42f8 (patch) | |
| tree | ba139bbd7990967197f674ff1201ce228b85362c /protocols/Skype/src | |
| parent | 913eb113dd70d059037424bfc6cf231dee896ac3 (diff) | |
Skype: fixed member quit from chat
git-svn-id: http://svn.miranda-ng.org/main/trunk@4953 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'protocols/Skype/src')
| -rw-r--r-- | protocols/Skype/src/resource.h | 10 | ||||
| -rw-r--r-- | protocols/Skype/src/skype_chat.cpp | 4 |
2 files changed, 11 insertions, 3 deletions
diff --git a/protocols/Skype/src/resource.h b/protocols/Skype/src/resource.h index 1362fb3da1..9e22a18bf4 100644 --- a/protocols/Skype/src/resource.h +++ b/protocols/Skype/src/resource.h @@ -19,6 +19,7 @@ #define IDI_CONF_SPAWN 110
#define IDI_SEND_CONTACTS 111
#define IDD_CHATROOM_CREATE 111
+#define IDD_CHATROOM_CONFIG 112
#define IDC_CCLIST 173
#define IDC_EDITSCR 174
#define IDC_ADDSCR 175
@@ -66,17 +67,24 @@ #define IDC_CHAT_TOPIC 1044
#define IDC_CHAT_GUIDLINE 1045
#define IDC_CHAT_JOINING 1046
+#define IDC_CHAT_GUIDLINE2 1046
#define IDC_COMBO1 1047
#define IDC_ROLES 1047
#define IDC_CHAT_ROLES 1047
+#define IDC_CHAT_GUIDLINE3 1047
#define IDC_CHAT_JOINING2 1048
#define IDC_CHAT_SECURED 1048
+#define IDC_CHAT_GUIDLINE4 1048
#define IDC_EDIT1 1049
#define IDC_CHAT_PASSWORD 1049
+#define IDC_CHAT_GUIDLINE5 1049
#define IDC_EDIT2 1050
#define IDC_CHAT_CONFIRMATION 1050
#define IDC_EDIT3 1051
#define IDC_CHAT_HINT 1051
+#define IDC_CHECK1 1052
+#define IDC_COMBO2 1053
+#define IDC_CHECK2 1054
// Next default values for new objects
//
@@ -84,7 +92,7 @@ #ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_NEXT_RESOURCE_VALUE 112
#define _APS_NEXT_COMMAND_VALUE 40001
-#define _APS_NEXT_CONTROL_VALUE 1052
+#define _APS_NEXT_CONTROL_VALUE 1054
#define _APS_NEXT_SYMED_VALUE 101
#endif
#endif
diff --git a/protocols/Skype/src/skype_chat.cpp b/protocols/Skype/src/skype_chat.cpp index ab08abafcc..2c9f45100c 100644 --- a/protocols/Skype/src/skype_chat.cpp +++ b/protocols/Skype/src/skype_chat.cpp @@ -492,7 +492,7 @@ void ChatRoom::RemoveMember(const ChatMember &item, DWORD timestamp) ChatMember *member = this->FindChatMember(item.GetSid());
if (member != NULL)
{
- this->SendEvent(*member, GC_EVENT_QUIT, timestamp);
+ this->SendEvent(*member, GC_EVENT_PART, timestamp);
this->members.remove(member);
delete member;
}
@@ -675,7 +675,7 @@ void ChatRoom::OnEvent(const ConversationRef &conversation, const MessageRef &me Message::CONSUMPTION_STATUS status;
message->GetPropConsumptionStatus(status);
- if (status == Message::UNCONSUMED_NORMAL)
+ if (status != Message::CONSUMED)
{
uint timestamp;
message->GetPropTimestamp(timestamp);
|