4 files changed, 7 insertions, 3 deletions

diff --git a/init.cpp b/init.cpp
index cd4342d..3afca12 100644
--- a/init.cpp
+++ b/init.cpp
@@ -160,6 +160,7 @@ static int OnModulesLoaded(WPARAM wParam,LPARAM lParam)
 
 	void InitCheck();
 	void FirstRun();
+	bIsMiranda09 = (DWORD)CallService(MS_SYSTEM_GETVERSION, 0, 0) >= 0x00090001?true:false;
 	FirstRun();
 	InitCheck();
 	InitIconLib();
@@ -185,7 +186,6 @@ static int OnModulesLoaded(WPARAM wParam,LPARAM lParam)
 	}
 
 
-	bIsMiranda09 = (DWORD)CallService(MS_SYSTEM_GETVERSION, 0, 0) >= 0x00090001?true:false;
 	bMetaContacts = ServiceExists(MS_MC_GETMETACONTACT);
 	
 	if(bJabberAPI && bIsMiranda09)
diff --git a/main.cpp b/main.cpp
index c5567ac..7a189e2 100644
--- a/main.cpp
+++ b/main.cpp
@@ -604,6 +604,8 @@ 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);
+		extern bool bIsMiranda09;
+		EnableWindow(GetDlgItem(hwndDlg, IDC_AUTO_EXCHANGE), bIsMiranda09);
       return TRUE;
     }
     
diff --git a/new_gpg.sln b/new_gpg.sln
index f3f75d2..6a74e17 100644
--- a/new_gpg.sln
+++ b/new_gpg.sln
@@ -41,7 +41,7 @@ Global
 		{F29D0C8D-141A-43CF-86B2-34A04653F8D4}.Release Unicode (static) x64|Win32.ActiveCfg = Release Unicode (static) x64|x64

 		{F29D0C8D-141A-43CF-86B2-34A04653F8D4}.Release Unicode (static) x64|x64.ActiveCfg = Release Unicode (static) x64|x64

 		{F29D0C8D-141A-43CF-86B2-34A04653F8D4}.Release Unicode (static) x64|x64.Build.0 = Release Unicode (static) x64|x64

-		{F29D0C8D-141A-43CF-86B2-34A04653F8D4}.Release Unicode (static)|Win32.ActiveCfg = Release Unicode (static)|x64

+		{F29D0C8D-141A-43CF-86B2-34A04653F8D4}.Release Unicode (static)|Win32.ActiveCfg = Release Unicode (static)|Win32

 		{F29D0C8D-141A-43CF-86B2-34A04653F8D4}.Release Unicode (static)|x64.ActiveCfg = Release Unicode (static)|x64

 		{F29D0C8D-141A-43CF-86B2-34A04653F8D4}.Release Unicode (static)|x64.Build.0 = Release Unicode (static)|x64

 		{F29D0C8D-141A-43CF-86B2-34A04653F8D4}.Release Unicode|Win32.ActiveCfg = Release Unicode|x64

diff --git a/options.cpp b/options.cpp
index 90fc4f4..c0debec 100644
--- a/options.cpp
+++ b/options.cpp
@@ -93,7 +93,7 @@ static BOOL CALLBACK DlgProcGpgOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARA
 	LVITEM item = {0};
 	TCHAR *tmp = NULL;
 	char *tmp2 = NULL;
-	extern bool bIsMiranda09;
+	extern bool bIsMiranda09, bJabberAPI;
 	NMLISTVIEW * hdr = (NMLISTVIEW *) lParam;
   switch (msg)
   {
@@ -178,6 +178,7 @@ static BOOL CALLBACK DlgProcGpgOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARA
 		mir_free(tmp);
 		CheckStateLoadDB(hwndDlg, IDC_DEBUG_LOG, "bDebugLog", 0);
 		EnableWindow(GetDlgItem(hwndDlg, IDC_JABBER_API), bIsMiranda09);
+		EnableWindow(GetDlgItem(hwndDlg, IDC_AUTO_EXCHANGE), (bIsMiranda09 && bJabberAPI));
 		{
 			string keyinfo = "Current private key id: ";
 			char *keyid = UniGetContactSettingUtf(NULL, szGPGModuleName, "KeyID", "");
@@ -366,6 +367,7 @@ static BOOL CALLBACK DlgProcGpgOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARA
     
   case WM_NOTIFY:
     {
+		EnableWindow(GetDlgItem(hwndDlg, IDC_AUTO_EXCHANGE), (bIsMiranda09 && IsDlgButtonChecked(hwndDlg, IDC_JABBER_API)));
 		if(hdr && IsWindowVisible(hdr->hdr.hwndFrom) && hdr->iItem != (-1))
 		{
 			if(hdr->hdr.code == NM_CLICK)