3 files changed, 56 insertions, 5 deletions

diff --git a/main.cpp b/main.cpp
index 7fdf27c..909902c 100644
--- 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,6 +630,7 @@ 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;
diff --git a/messages.cpp b/messages.cpp
index 4b4a686..8b339ab 100644
--- a/messages.cpp
+++ b/messages.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
@@ -39,7 +39,31 @@ int RecvMsgSvc_func(HANDLE hContact, std::wstring str, char *msg, DWORD flags, D
 			if(!isContactSecured(hContact))
 			{
 				debuglog<<time_str()<<": info: "<<"received message from: "<<(TCHAR*)CallService(MS_CLIST_GETCONTACTDISPLAYNAME, (WPARAM)hContact, GCDNF_TCHAR)<<" with turned off encryption\n";
-				if(MessageBox(0, _T("We received encrypted message from contact with encryption turned off.\nDo you want turn on encryption for this contact ?"), _T("Warning"), MB_YESNO) == IDYES)
+				if(bAutoExchange)
+				{
+					if(!isContactHaveKey(hContact))
+					{
+						void ShowLoadPublicKeyDialog();
+						extern map<int, HANDLE> user_data;
+						extern int item_num;
+						item_num = 0;		 //black magic here
+						user_data[1] = hContact;
+						ShowLoadPublicKeyDialog();
+					}
+					else
+					{
+						DBWriteContactSettingByte(metaGetMostOnline(hContact), szGPGModuleName, "GPGEncryption", 1);
+						setSrmmIcon(hContact);
+						setClistIcon(hContact);
+					}
+					if(isContactHaveKey(hContact))
+					{
+						DBWriteContactSettingByte(metaGetMostOnline(hContact), szGPGModuleName, "GPGEncryption", 1);
+						setSrmmIcon(hContact);
+						setClistIcon(hContact);
+					}
+				}
+				else if(MessageBox(0, _T("We received encrypted message from contact with encryption turned off.\nDo you want turn on encryption for this contact ?"), _T("Warning"), MB_YESNO) == IDYES)
 				{
 					if(!isContactHaveKey(hContact))
 					{
@@ -662,7 +686,33 @@ int SendMsgSvc_func(HANDLE hContact, char *msg, DWORD flags)
 	if(out.find("There is no assurance this key belongs to the named user") != string::npos)
 	{
 		out.clear();
-		if(MessageBox(0, _T("We trying to encrypt with untrusted key, do you want to trust this key permanently ?"), _T("Warning"), MB_YESNO) == IDYES)
+				if(bAutoExchange)
+				{
+					DBWriteContactSettingByte(hContact, szGPGModuleName, "bAlwaysTrust", 1);
+					cmd.insert(0, _T("--trust-model always "));
+					gpg_execution_params params;
+					pxResult result;
+					params.cmd = &cmd;
+					params.useless = "";
+					params.out = &out;
+					params.code = &code;
+					params.result = &result;
+					boost::thread gpg_thread(boost::bind(&pxEexcute_thread, &params));
+					if(!gpg_thread.timed_join(boost::posix_time::seconds(10)))
+					{
+						gpg_thread.~thread();
+						TerminateProcess(params.hProcess, 1);
+						debuglog<<time_str()<<": GPG execution timed out, aborted\n";
+						mir_free(msg);
+						return CallContactService(hContact, PSS_MESSAGE, (WPARAM)flags, (LPARAM)msg);
+					}
+					if(result == pxNotFound)
+					{
+						mir_free(msg);
+						return CallContactService(hContact, PSS_MESSAGE, (WPARAM)flags, (LPARAM)msg);
+					}
+				}
+				else if(MessageBox(0, _T("We trying to encrypt with untrusted key, do you want to trust this key permanently ?"), _T("Warning"), MB_YESNO) == IDYES)
 		{
 			DBWriteContactSettingByte(hContact, szGPGModuleName, "bAlwaysTrust", 1);
 			cmd.insert(0, _T("--trust-model always "));
diff --git a/new_gpg.vcxproj b/new_gpg.vcxproj
index 3a81c15..19274a0 100644
--- a/new_gpg.vcxproj
+++ b/new_gpg.vcxproj
@@ -654,7 +654,7 @@
     <Link>

       <AdditionalDependencies>shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>

       <SuppressStartupBanner>true</SuppressStartupBanner>

-      <AdditionalLibraryDirectories>x:\temp\windows\libs\boost\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

+      <AdditionalLibraryDirectories>C:\Boost\lib-release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

       <GenerateDebugInformation>false</GenerateDebugInformation>

       <SubSystem>NotSet</SubSystem>

       <OptimizeReferences>true</OptimizeReferences>