Skype: fixed member quit from chat

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

3 files changed, 57 insertions, 13 deletions

diff --git a/protocols/Skype/res/Resource.rc b/protocols/Skype/res/Resource.rc
index 5aee137c79..25c4585c6f 100644
--- a/protocols/Skype/res/Resource.rc
+++ b/protocols/Skype/res/Resource.rc
@@ -27,7 +27,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 IDD_CHATROOM_INVITE DIALOGEX 0, 0, 190, 179

 STYLE DS_SETFONT | DS_3DLOOK | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU

 EXSTYLE WS_EX_TOPMOST

-CAPTION "Invite Contact To Chat"

+CAPTION "Invite contacts to conference"

 FONT 8, "MS Shell Dlg", 0, 0, 0x0

 BEGIN

     LTEXT           "sid",-1,7,128,43,9

@@ -55,15 +55,39 @@ BEGIN
     LTEXT           "Guidline:",IDC_STATIC,188,31,180,8

     EDITTEXT        IDC_CHAT_GUIDLINE,188,41,180,14,ES_AUTOHSCROLL

     CONTROL         "Enable joining",IDC_CHAT_JOINING,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,188,58,180,10

-    LTEXT           "User joining as:",IDC_STATIC,188,73,79,8

-    COMBOBOX        IDC_CHAT_ROLES,271,71,97,30,CBS_DROPDOWN | CBS_SORT | WS_VSCROLL | WS_TABSTOP

-    CONTROL         "Create with password",IDC_CHAT_SECURED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,188,88,180,10

-    LTEXT           "Password:",IDC_STATIC,197,101,171,8

-    EDITTEXT        IDC_CHAT_PASSWORD,198,112,170,14,ES_PASSWORD | ES_AUTOHSCROLL | WS_DISABLED

-    LTEXT           "Confirmation:",IDC_STATIC,197,129,171,8

-    EDITTEXT        IDC_CHAT_CONFIRMATION,198,140,170,14,ES_PASSWORD | ES_AUTOHSCROLL | WS_DISABLED

-    LTEXT           "Password hint:",IDC_STATIC,198,156,170,8

-    EDITTEXT        IDC_CHAT_HINT,198,167,170,14,ES_AUTOHSCROLL | WS_DISABLED

+    LTEXT           "Users joining as:",IDC_STATIC,188,73,79,8

+    COMBOBOX        IDC_CHAT_ROLES,188,83,180,30,CBS_DROPDOWN | CBS_SORT | WS_VSCROLL | WS_TABSTOP

+    CONTROL         "Create with password",IDC_CHAT_SECURED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,188,98,180,10

+    LTEXT           "Password:",IDC_STATIC,197,111,171,8

+    EDITTEXT        IDC_CHAT_PASSWORD,198,122,170,14,ES_PASSWORD | ES_AUTOHSCROLL | WS_DISABLED

+    LTEXT           "Confirmation:",IDC_STATIC,197,139,171,8

+    EDITTEXT        IDC_CHAT_CONFIRMATION,198,150,170,14,ES_PASSWORD | ES_AUTOHSCROLL | WS_DISABLED

+    LTEXT           "Password hint:",IDC_STATIC,198,166,170,8

+    EDITTEXT        IDC_CHAT_HINT,198,177,170,14,ES_AUTOHSCROLL | WS_DISABLED

+END

+

+IDD_CHATROOM_CONFIG DIALOGEX 0, 0, 243, 316

+STYLE DS_SETFONT | DS_3DLOOK | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU

+EXSTYLE WS_EX_TOPMOST

+CAPTION "Configure conference"

+FONT 8, "MS Shell Dlg", 0, 0, 0x0

+BEGIN

+    PUSHBUTTON      "&OK",IDOK,141,296,46,14

+    PUSHBUTTON      "&Cancel",IDCANCEL,191,296,45,14

+    LTEXT           "Topic:",IDC_STATIC,5,13,74,8

+    EDITTEXT        IDC_CHAT_TOPIC,5,23,231,14,ES_AUTOHSCROLL

+    LTEXT           "Guidline:",IDC_STATIC,5,44,73,8

+    EDITTEXT        IDC_CHAT_GUIDLINE,5,54,231,14,ES_AUTOHSCROLL

+    LTEXT           "Password:",IDC_STATIC,16,131,62,8

+    EDITTEXT        IDC_CHAT_GUIDLINE2,84,128,152,14,ES_AUTOHSCROLL

+    CONTROL         "Enable joining",IDC_CHECK1,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,5,72,231,10

+    LTEXT           "Join role:",IDC_STATIC,5,88,73,8

+    COMBOBOX        IDC_COMBO2,5,98,231,30,CBS_DROPDOWN | CBS_SORT | WS_VSCROLL | WS_TABSTOP

+    CONTROL         "Set password",IDC_CHECK2,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,5,114,231,10

+    LTEXT           "Confirmation:",IDC_STATIC,16,149,62,8

+    EDITTEXT        IDC_CHAT_GUIDLINE3,84,146,152,14,ES_AUTOHSCROLL

+    LTEXT           "Hint:",IDC_STATIC,16,167,62,8

+    EDITTEXT        IDC_CHAT_GUIDLINE4,84,164,152,14,ES_AUTOHSCROLL

 END

 

 

@@ -93,6 +117,18 @@ BEGIN
         TOPMARGIN, 4

         BOTTOMMARGIN, 223

     END

+

+    IDD_CHATROOM_CONFIG, DIALOG

+    BEGIN

+        RIGHTMARGIN, 241

+        VERTGUIDE, 5

+        VERTGUIDE, 16

+        VERTGUIDE, 78

+        VERTGUIDE, 84

+        VERTGUIDE, 236

+        TOPMARGIN, 4

+        BOTTOMMARGIN, 310

+    END

 END

 #endif    // APSTUDIO_INVOKED

 

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);