1 files changed, 3 insertions, 53 deletions

diff --git a/messages.cpp b/messages.cpp
index 8b339ab..4b4a686 100644..100755
--- 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,31 +39,7 @@ 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(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(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))
 					{
@@ -686,33 +662,7 @@ 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(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)
+		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 "));