ICQ:

- option "Enable AIM support" removed due to tight integration with MRA, which also uses string ids;
- caps macros removed, cause we don't wanna these options to be disabled;
- copyright update;
- version bump.

1 files changed, 1 insertions, 5 deletions

diff --git a/protocols/IcqOscarJ/src/icq_opts.cpp b/protocols/IcqOscarJ/src/icq_opts.cpp
index 64804704c2..a05b3c236d 100644
--- a/protocols/IcqOscarJ/src/icq_opts.cpp
+++ b/protocols/IcqOscarJ/src/icq_opts.cpp
@@ -6,7 +6,7 @@
 // Copyright © 2001-2002 Jon Keating, Richard Hughes

 // Copyright © 2002-2004 Martin Öberg, Sam Kothari, Robert Rainwater

 // Copyright © 2004-2010 Joe Kucera

-// Copyright © 2012-2014 Miranda NG Team

+// Copyright © 2012-2017 Miranda NG Team

 //

 // This program is free software; you can redistribute it and/or

 // modify it under the terms of the GNU General Public License

@@ -334,7 +334,6 @@ static BOOL CALLBACK FillCpCombo(LPSTR str)
 static const UINT icqDCMsgControls[] = { IDC_DCPASSIVE };

 static const UINT icqXStatusControls[] = { IDC_XSTATUSAUTO };

 static const UINT icqCustomStatusControls[] = { IDC_XSTATUSRESET };

-static const UINT icqAimControls[] = { IDC_AIMENABLE };

 

 static INT_PTR CALLBACK DlgProcIcqFeaturesOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)

 {

@@ -362,8 +361,6 @@ static INT_PTR CALLBACK DlgProcIcqFeaturesOpts(HWND hwndDlg, UINT msg, WPARAM wP
 			LoadDBCheckState(ppro, hwndDlg, IDC_XSTATUSAUTO, "XStatusAuto", DEFAULT_XSTATUS_AUTO);

 			LoadDBCheckState(ppro, hwndDlg, IDC_XSTATUSRESET, "XStatusReset", DEFAULT_XSTATUS_RESET);

 			LoadDBCheckState(ppro, hwndDlg, IDC_KILLSPAMBOTS, "KillSpambots", DEFAULT_KILLSPAM_ENABLED);

-			LoadDBCheckState(ppro, hwndDlg, IDC_AIMENABLE, "AimEnabled", DEFAULT_AIM_ENABLED);

-			icq_EnableMultipleControls(hwndDlg, icqAimControls, _countof(icqAimControls), ppro->icqOnline() ? FALSE : TRUE);

 

 			hCpCombo = GetDlgItem(hwndDlg, IDC_UTFCODEPAGE);

 			int sCodePage = ppro->getWord("AnsiCodePage", CP_ACP);

@@ -424,7 +421,6 @@ static INT_PTR CALLBACK DlgProcIcqFeaturesOpts(HWND hwndDlg, UINT msg, WPARAM wP
 			StoreDBCheckState(ppro, hwndDlg, IDC_XSTATUSAUTO, "XStatusAuto");

 			StoreDBCheckState(ppro, hwndDlg, IDC_XSTATUSRESET, "XStatusReset");

 			StoreDBCheckState(ppro, hwndDlg, IDC_KILLSPAMBOTS, "KillSpambots");

-			StoreDBCheckState(ppro, hwndDlg, IDC_AIMENABLE, "AimEnabled");

 			return TRUE;

 		}

 		break;