From 4718126325915c3a6061f0d7334c4da4b2c111b0 Mon Sep 17 00:00:00 2001
From: Kirill Volinsky <mataes2007@gmail.com>
Date: Thu, 25 Apr 2013 08:36:56 +0000
Subject: fixed apply button activation

git-svn-id: http://svn.miranda-ng.org/main/trunk@4529 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 protocols/Skype/src/resource.h        | 12 ++++--------
 protocols/Skype/src/skype_dialogs.cpp | 12 ++++++++++--
 2 files changed, 14 insertions(+), 10 deletions(-)

(limited to 'protocols/Skype')

diff --git a/protocols/Skype/src/resource.h b/protocols/Skype/src/resource.h
index 312ced9d5e..b6c51c5a9d 100644
--- a/protocols/Skype/src/resource.h
+++ b/protocols/Skype/src/resource.h
@@ -2,9 +2,7 @@
 // Microsoft Visual C++ generated include file.
 // Used by e:\Projects\C++\MirandaNG\protocols\Skype\res\Resource.rc
 //
-#define IDD_SKYPEACCOUNT                9
 #define IDD_ACCMGR                      9
-#define IDD_OPTIONS                     10
 #define IDD_OPT_MAIN                    10
 #define IDD_INFO_SKYPE                  11
 #define IDD_OWNINFO_SKYPE               12
@@ -15,7 +13,6 @@
 #define IDI_AUTH_GRANT                  103
 #define IDI_AUTH_REQUEST                104
 #define IDI_AUTH_REVOKE                 105
-#define IDD_PASSWORDREQUEST             106
 #define IDD_PASSWORD_REQUEST            106
 #define IDR_KEY                         107
 #define IDC_CCLIST                      173
@@ -29,11 +26,8 @@
 #define IDC_PASSWORD                    1006
 #define IDC_INSTRUCTION                 1007
 #define IDC_SID                         1008
-#define IDC_INSTRUCTION2                1008
 #define IDC_STATUSTEXT                  1009
-#define IDC_PASSWORD2                   1009
 #define IDC_ONLINESINCE                 1010
-#define IDC_INSTRUCTION3                1010
 #define IDC_LASTEVENTDATE               1011
 #define IDC_PASSWORD3                   1011
 #define IDC_LASTPROFILECHANGE           1012
@@ -41,12 +35,14 @@
 #define IDC_LIST                        1014
 #define IDC_UPLOADING                   1015
 #define IDC_PORT                        1016
-#define IDC_CHECK1                      1017
 #define IDC_USE_ALT_PORTS               1017
 #define IDC_REGISTER                    1018
 #define IDC_CHANGE_PWD                  1019
 #define IDC_DEFAULT_GROUP               1020
 #define IDC_GROUP                       1021
+#define IDC_INSTRUCTION2                1022
+#define IDC_PASSWORD2                   1023
+#define IDC_INSTRUCTION3                1024
 
 // Next default values for new objects
 // 
@@ -54,7 +50,7 @@
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_NEXT_RESOURCE_VALUE        108
 #define _APS_NEXT_COMMAND_VALUE         40001
-#define _APS_NEXT_CONTROL_VALUE         1022
+#define _APS_NEXT_CONTROL_VALUE         1025
 #define _APS_NEXT_SYMED_VALUE           101
 #endif
 #endif
diff --git a/protocols/Skype/src/skype_dialogs.cpp b/protocols/Skype/src/skype_dialogs.cpp
index 584bdf91d2..cf8f640541 100644
--- a/protocols/Skype/src/skype_dialogs.cpp
+++ b/protocols/Skype/src/skype_dialogs.cpp
@@ -96,11 +96,18 @@ INT_PTR CALLBACK CSkypeProto::SkypeMainOptionsProc(HWND hwnd, UINT message, WPAR
 				{
 					if ((HIWORD(wParam) != EN_CHANGE || (HWND)lParam != GetFocus()))
 						return 0;
-					else
-						SendMessage(GetParent(hwnd), PSM_CHANGED, 0, 0);
+					SendMessage(GetParent(hwnd), PSM_CHANGED, 0, 0);
 				}
+				break;
 
 			case IDC_PORT:
+				{
+					if ((HIWORD(wParam) != EN_CHANGE || (HWND)lParam != GetFocus()))
+						return 0;
+					SendMessage(GetParent(hwnd), PSM_CHANGED, 0, 0);
+				}
+				break;
+
 			case IDC_USE_ALT_PORTS:
 				SendMessage(GetParent(hwnd), PSM_CHANGED, 0, 0);
 				break;
@@ -128,6 +135,7 @@ INT_PTR CALLBACK CSkypeProto::SkypeMainOptionsProc(HWND hwnd, UINT message, WPAR
 						proto->ShowNotification(CSkypeProto::ValidationReasons[reason]);
 					}
 				}
+				return FALSE;
 
 			case IDC_CHANGE_PWD:
 				{
-- 
cgit v1.2.3