Merge branch 'new_gpg' into new_gpg_autoexchangenew_gpg_autoexchange

Conflicts:
	main.cpp
	messages.cpp

1 files changed, 1 insertions, 2 deletions

diff --git a/main.cpp b/main.cpp
index 909902c..7fdf27c 100644..100755
--- a/main.cpp
+++ b/main.cpp
@@ -1,4 +1,4 @@
-// Copyright � 2010-2011 sss
+// Copyright © 2010-2011 sss
 // 
 // This program is free software; you can redistribute it and/or
 // modify it under the terms of the GNU General Public License
@@ -630,7 +630,6 @@ static BOOL CALLBACK DlgProcGpgBinOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LP
 		mir_free(tmp);
 		if(gpg_exists && lang_exists && !bad_version)
 			MessageBox(0, _T("You have supported version of gpg binary, and gpg language file in place!\ngpg plugin should work fine on your installation!\njust press ok in wollowing diallog."), _T("Info"), MB_OK);
-		CheckDlgButton(hwndDlg, IDC_AUTO_EXCHANGE, 1);
 		extern bool bIsMiranda09;
 		EnableWindow(GetDlgItem(hwndDlg, IDC_AUTO_EXCHANGE), bIsMiranda09);
       return TRUE;