aim:

	force disabled ssl as it does not work anymore

TODO:
	implement "clientlogin" api for icq/aim
	it's requires at least key of registrtrd developer on aol
	it's using https login procediure with redirect to actual aim/icq server after successfule login procedure

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

1 files changed, 15 insertions, 8 deletions

diff --git a/protocols/AimOscar/src/ui.cpp b/protocols/AimOscar/src/ui.cpp
index 16c4328468..997ce54676 100644..100755
--- a/protocols/AimOscar/src/ui.cpp
+++ b/protocols/AimOscar/src/ui.cpp
@@ -742,7 +742,8 @@ static INT_PTR CALLBACK options_dialog(HWND hwndDlg, UINT msg, WPARAM wParam, LP
 				SetDlgItemTextA(hwndDlg, IDC_HN, dbv.pszVal);

 				db_free(&dbv);

 			}

-			else SetDlgItemTextA(hwndDlg, IDC_HN, ppro->getByte(AIM_KEY_DSSL, 0) ? AIM_DEFAULT_SERVER_NS : AIM_DEFAULT_SERVER);

+			//else SetDlgItemTextA(hwndDlg, IDC_HN, ppro->getByte(AIM_KEY_DSSL, 0) ? AIM_DEFAULT_SERVER_NS : AIM_DEFAULT_SERVER);

+			else SetDlgItemTextA(hwndDlg, IDC_HN, AIM_DEFAULT_SERVER);

 

 			SetDlgItemInt(hwndDlg, IDC_PN, ppro->get_default_port(), FALSE);

 

@@ -758,7 +759,8 @@ static INT_PTR CALLBACK options_dialog(HWND hwndDlg, UINT msg, WPARAM wParam, LP
 			CheckDlgButton(hwndDlg, IDC_CM, ppro->getByte(AIM_KEY_CM, 0) ? BST_CHECKED : BST_UNCHECKED);//Check Mail

 			CheckDlgButton(hwndDlg, IDC_MG, ppro->getByte(AIM_KEY_MG, 1) ? BST_CHECKED : BST_UNCHECKED);//Manage Groups

 			CheckDlgButton(hwndDlg, IDC_DA, ppro->getByte(AIM_KEY_DA, 0) ? BST_CHECKED : BST_UNCHECKED);//Disable Avatars

-			CheckDlgButton(hwndDlg, IDC_DSSL, ppro->getByte(AIM_KEY_DSSL, 0) ? BST_CHECKED : BST_UNCHECKED);//Disable SSL

+			//CheckDlgButton(hwndDlg, IDC_DSSL, ppro->getByte(AIM_KEY_DSSL, 0) ? BST_CHECKED : BST_UNCHECKED);//Disable SSL

+			CheckDlgButton(hwndDlg, IDC_DSSL, BST_CHECKED);//Disable SSL

 			CheckDlgButton(hwndDlg, IDC_FSC, ppro->getByte(AIM_KEY_FSC, 0) ? BST_CHECKED : BST_UNCHECKED);//Force Single Client

 		}

 		break;

@@ -767,15 +769,18 @@ static INT_PTR CALLBACK options_dialog(HWND hwndDlg, UINT msg, WPARAM wParam, LP
 		switch (LOWORD(wParam)) {

 		case IDC_DSSL:

 			{

-				bool dssl = IsDlgButtonChecked(hwndDlg, IDC_DSSL) != 0;

+/*				bool dssl = IsDlgButtonChecked(hwndDlg, IDC_DSSL) != 0;

 				SetDlgItemTextA(hwndDlg, IDC_HN, dssl ? AIM_DEFAULT_SERVER_NS : AIM_DEFAULT_SERVER);

-				SetDlgItemInt(hwndDlg, IDC_PN, dssl ? AIM_DEFAULT_PORT : AIM_DEFAULT_SSL_PORT, FALSE);

+				SetDlgItemInt(hwndDlg, IDC_PN, dssl ? AIM_DEFAULT_PORT : AIM_DEFAULT_SSL_PORT, FALSE);*/

+				SetDlgItemTextA(hwndDlg, IDC_HN, AIM_DEFAULT_SERVER);

+				SetDlgItemInt(hwndDlg, IDC_PN, AIM_DEFAULT_PORT, FALSE);

 			}

 			break;

 

 		case IDC_SVRRESET:

-			SetDlgItemTextA(hwndDlg, IDC_HN,

-				IsDlgButtonChecked(hwndDlg, IDC_DSSL) ? AIM_DEFAULT_SERVER_NS : AIM_DEFAULT_SERVER);

+/*			SetDlgItemTextA(hwndDlg, IDC_HN,

+				IsDlgButtonChecked(hwndDlg, IDC_DSSL) ? AIM_DEFAULT_SERVER_NS : AIM_DEFAULT_SERVER); */

+			SetDlgItemTextA(hwndDlg, IDC_HN, AIM_DEFAULT_SERVER);

 			SetDlgItemInt(hwndDlg, IDC_PN, ppro->get_default_port(), FALSE);

 			break;

 

@@ -838,7 +843,8 @@ static INT_PTR CALLBACK options_dialog(HWND hwndDlg, UINT msg, WPARAM wParam, LP
 				//Disable Avatar

 

 				//Disable SSL

-				ppro->setByte(AIM_KEY_DSSL, IsDlgButtonChecked(hwndDlg, IDC_DSSL) != 0);

+				//ppro->setByte(AIM_KEY_DSSL, IsDlgButtonChecked(hwndDlg, IDC_DSSL) != 0);

+				ppro->setByte(AIM_KEY_DSSL, 1);

 				//Disable SSL

 

 				//Force Single Login

@@ -851,7 +857,8 @@ static INT_PTR CALLBACK options_dialog(HWND hwndDlg, UINT msg, WPARAM wParam, LP
 

 				//PN

 				int port = GetDlgItemInt(hwndDlg, IDC_PN, NULL, FALSE);

-				if (port > 0 && port != (ppro->getByte(AIM_KEY_DSSL, 0) ? AIM_DEFAULT_PORT : AIM_DEFAULT_SSL_PORT))

+				//if (port > 0 && port != (ppro->getByte(AIM_KEY_DSSL, 0) ? AIM_DEFAULT_PORT : AIM_DEFAULT_SSL_PORT))

+				if (port > 0 && port != AIM_DEFAULT_PORT)

 					ppro->setWord(AIM_KEY_PN, (WORD)port);

 				else

 					ppro->delSetting(AIM_KEY_PN);