debuglog refactoring

more debug info in log

git-svn-id: http://svn.miranda-ng.org/main/trunk@2993 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

6 files changed, 125 insertions, 88 deletions

diff --git a/plugins/New_GPG/src/gpg_wrapper.cpp b/plugins/New_GPG/src/gpg_wrapper.cpp
index d743af4c8b..b2c65854cf 100755
--- a/plugins/New_GPG/src/gpg_wrapper.cpp
+++ b/plugins/New_GPG/src/gpg_wrapper.cpp
@@ -80,7 +80,7 @@ pxResult pxExecute(wstring *acommandline, char *ainput, string *aoutput, LPDWORD
 			if(errno == ENOENT)
 			{
 				mir_free(bin_path);
-				debuglog<<time_str()<<": GPG executable not found\n";
+				debuglog<<std::string(time_str()+": GPG executable not found");
 				*result = pxNotFound;
 				return pxNotFound;
 			}
@@ -100,7 +100,7 @@ pxResult pxExecute(wstring *acommandline, char *ainput, string *aoutput, LPDWORD
 		mir_free(home_dir);
 	}
 
-	debuglog<<time_str()<<": gpg in: "<<commandline<<"\n";
+	debuglog<<std::string(time_str()+": gpg in: "+toUTF8(commandline));
 
 	success = CreateProcess(NULL, (TCHAR*)commandline.c_str(), NULL, NULL, TRUE, CREATE_NEW_CONSOLE | CREATE_UNICODE_ENVIRONMENT, (void*)_T("LANGUAGE=en@quot\0LC_ALL=English\0"), NULL, &sinfo, &pri);
 
@@ -142,7 +142,7 @@ pxResult pxExecute(wstring *acommandline, char *ainput, string *aoutput, LPDWORD
 
 	fix_line_term(*aoutput);
 
-	debuglog<<time_str()<<": gpg out: "<<aoutput->c_str();
+	debuglog<<std::string(time_str()+": gpg out: "+*aoutput);
 
 	WaitForSingleObject(pri.hProcess,INFINITE);
 
@@ -155,6 +155,11 @@ pxResult pxExecute(wstring *acommandline, char *ainput, string *aoutput, LPDWORD
 
 	*result = pxSuccess;
 //	gpg_mutex.unlock();
+	if(*aexitcode)
+	{
+		debuglog<<std::string(time_str()+": warning: wrong gpg exit status, gpg output: "+*aoutput);
+		return pxSuccessExitCodeInvalid;
+	}
 	return pxSuccess;
 }
 
diff --git a/plugins/New_GPG/src/log.cpp b/plugins/New_GPG/src/log.cpp
index 7618914f66..273d37060d 100755
--- a/plugins/New_GPG/src/log.cpp
+++ b/plugins/New_GPG/src/log.cpp
@@ -25,6 +25,7 @@ logtofile& logtofile::operator<<(TCHAR *buf)
 		log_mutex.lock();

 		log.open(toUTF8(path).c_str(), std::ios::app |std::ios::ate);

 		log<<toUTF8(buf);

+		log<<"\n";

 		log.close();

 		log_mutex.unlock();

 	}

@@ -38,6 +39,7 @@ logtofile& logtofile::operator<<(char *buf)
 		log_mutex.lock();

 		log.open(toUTF8(path).c_str(), std::ios::app |std::ios::ate);

 		log<<buf;

+		log<<"\n";

 		log.close();

 		log_mutex.unlock();

 	}

@@ -52,6 +54,7 @@ logtofile& logtofile::operator<<(string buf)
 		char *tmp = mir_utf8encode(buf.c_str());

 		log.open(toUTF8(path).c_str(), std::ios::app |std::ios::ate);

 		log<<tmp;

+		log<<"\n";

 		log.close();

 		log_mutex.unlock();

 		mir_free(tmp);

@@ -66,6 +69,7 @@ logtofile& logtofile::operator<<(wstring buf)
 		log_mutex.lock();

 		log.open(toUTF8(path).c_str(), std::ios::app |std::ios::ate);

 		log<<toUTF8(buf);

+		log<<"\n";

 		log.close();

 		log_mutex.unlock();

 	}

diff --git a/plugins/New_GPG/src/main.cpp b/plugins/New_GPG/src/main.cpp
index b3e23dd368..95a006c5c5 100755
--- a/plugins/New_GPG/src/main.cpp
+++ b/plugins/New_GPG/src/main.cpp
@@ -103,7 +103,7 @@ static INT_PTR CALLBACK DlgProcFirstRun(HWND hwndDlg,UINT msg,WPARAM wParam,LPAR
 						gpg_thread.~thread();

 						TerminateProcess(params.hProcess, 1);

 						params.hProcess = NULL;

-						debuglog<<time_str()<<": GPG execution timed out, aborted\n";

+						debuglog<<std::string(time_str()+": GPG execution timed out, aborted");

 						break;

 					}

 					if(result == pxNotFound)

@@ -251,7 +251,7 @@ static INT_PTR CALLBACK DlgProcFirstRun(HWND hwndDlg,UINT msg,WPARAM wParam,LPAR
 				  gpg_thread.~thread();

 				  TerminateProcess(params.hProcess, 1);

 				  params.hProcess = NULL;

-				  debuglog<<time_str()<<": GPG execution timed out, aborted\n";

+				  debuglog<<std::string(time_str()+": GPG execution timed out, aborted");

 				  break;

 			  }

 			  if(result == pxNotFound)

@@ -343,7 +343,7 @@ static INT_PTR CALLBACK DlgProcFirstRun(HWND hwndDlg,UINT msg,WPARAM wParam,LPAR
 							  gpg_thread.~thread();

 							  TerminateProcess(params.hProcess, 1);

 							  params.hProcess = NULL;

-							  debuglog<<time_str()<<": GPG execution timed out, aborted\n";

+							  debuglog<<std::string(time_str()+": GPG execution timed out, aborted");

 							  break;

 						  }

 						  if(result == pxNotFound)

@@ -416,7 +416,7 @@ static INT_PTR CALLBACK DlgProcFirstRun(HWND hwndDlg,UINT msg,WPARAM wParam,LPAR
 				  delete gpg_thread;

 				  TerminateProcess(params.hProcess, 1);

 				  params.hProcess = NULL;

-				  debuglog<<time_str()<<": GPG execution timed out, aborted\n";

+				  debuglog<<std::string(time_str()+": GPG execution timed out, aborted");

 				  break;

 			  }

 			  if(result == pxNotFound)

@@ -445,7 +445,7 @@ static INT_PTR CALLBACK DlgProcFirstRun(HWND hwndDlg,UINT msg,WPARAM wParam,LPAR
 				  delete gpg_thread;

 				  TerminateProcess(params.hProcess, 1);

 				  params.hProcess = NULL;

-				  debuglog<<time_str()<<": GPG execution timed out, aborted\n";

+				  debuglog<<std::string(time_str()+": GPG execution timed out, aborted");

 				  break;

 			  }

 			  if(result == pxNotFound)

@@ -547,7 +547,7 @@ static INT_PTR CALLBACK DlgProcFirstRun(HWND hwndDlg,UINT msg,WPARAM wParam,LPAR
 					  gpg_thread.~thread();

 					  TerminateProcess(params.hProcess, 1);

 					  params.hProcess = NULL;

-					  debuglog<<time_str()<<": GPG execution timed out, aborted";

+					  debuglog<<std::string(time_str()+": GPG execution timed out, aborted");

 					  break;

 				  }

 				  if(result == pxNotFound)

@@ -579,7 +579,7 @@ static INT_PTR CALLBACK DlgProcFirstRun(HWND hwndDlg,UINT msg,WPARAM wParam,LPAR
 					  gpg_thread.~thread();

 					  TerminateProcess(params.hProcess, 1);

 					  params.hProcess = NULL;

-					  debuglog<<time_str()<<"GPG execution timed out, aborted\n";

+					  debuglog<<std::string(time_str()+"GPG execution timed out, aborted");

 					  break;

 				  }

 				  if(result == pxNotFound)

@@ -762,7 +762,7 @@ static INT_PTR CALLBACK DlgProcGpgBinOpts(HWND hwndDlg, UINT msg, WPARAM wParam,
 				gpg_thread.~thread();

 				TerminateProcess(params.hProcess, 1);

 				params.hProcess = NULL;

-				debuglog<<time_str()<<": GPG execution timed out, aborted\n";

+				debuglog<<std::string(time_str()+": GPG execution timed out, aborted");

 			}

 			gpg_valid = false;

 			DBDeleteContactSetting(NULL, szGPGModuleName, "szGpgBinPath");

@@ -882,7 +882,7 @@ static INT_PTR CALLBACK DlgProcGpgBinOpts(HWND hwndDlg, UINT msg, WPARAM wParam,
 				  TerminateProcess(params.hProcess, 1);

 				  params.hProcess = NULL;

 				  gpg_thread.~thread();

-				  debuglog<<time_str()<<": GPG execution timed out, aborted\n";

+				  debuglog<<std::string(time_str()+": GPG execution timed out, aborted");

 			  }

 			  gpg_valid = false;

 			  DBDeleteContactSetting(NULL, szGPGModuleName, "szGpgBinPath");

@@ -971,7 +971,7 @@ static INT_PTR CALLBACK DlgProcGpgBinOpts(HWND hwndDlg, UINT msg, WPARAM wParam,
 					TerminateProcess(params.hProcess, 1);

 					params.hProcess = NULL;

 					gpg_thread.~thread();

-					debuglog<<time_str()<<": GPG execution timed out, aborted\n";

+					debuglog<<std::string(time_str()+": GPG execution timed out, aborted");

 				}

 				gpg_valid = false;

 				DBDeleteContactSetting(NULL, szGPGModuleName, "szGpgBinPath");

@@ -1063,7 +1063,7 @@ static INT_PTR CALLBACK DlgProcGpgBinOpts(HWND hwndDlg, UINT msg, WPARAM wParam,
 					  gpg_thread.~thread();

 					  TerminateProcess(params.hProcess, 1);

 					  params.hProcess = NULL;

-					  debuglog<<time_str()<<": GPG execution timed out, aborted";

+					  debuglog<<std::string(time_str()+": GPG execution timed out, aborted");

 					  gpg_valid = false;

 					  break;

 				  }

@@ -1097,7 +1097,7 @@ static INT_PTR CALLBACK DlgProcGpgBinOpts(HWND hwndDlg, UINT msg, WPARAM wParam,
 					  gpg_thread.~thread();

 					  TerminateProcess(params.hProcess, 1);

 					  params.hProcess = NULL;

-					  debuglog<<time_str()<<"GPG execution timed out, aborted\n";

+					  debuglog<<std::string(time_str()+"GPG execution timed out, aborted");

 					  gpg_valid = false;

 					  break;

 				  }

@@ -1431,7 +1431,7 @@ static INT_PTR CALLBACK DlgProcKeyGenDialog(HWND hwndDlg, UINT msg, WPARAM wPara
 					  gpg_thread.~thread();

 					  TerminateProcess(params.hProcess, 1);

 					  params.hProcess = NULL;

-					  debuglog<<time_str()<<": GPG execution timed out, aborted\n";

+					  debuglog<<std::string(time_str()+": GPG execution timed out, aborted");

 					  break;

 				  }

 				  if(result == pxNotFound)

@@ -1464,7 +1464,7 @@ static INT_PTR CALLBACK DlgProcKeyGenDialog(HWND hwndDlg, UINT msg, WPARAM wPara
 						gpg_thread.~thread();

 						TerminateProcess(params.hProcess, 1);

 						params.hProcess = NULL;

-						debuglog<<time_str()<<": GPG execution timed out, aborted\n";

+						debuglog<<std::string(time_str()+": GPG execution timed out, aborted");

 						break;

 					}

 					if(result == pxNotFound)

@@ -1626,7 +1626,7 @@ static INT_PTR CALLBACK DlgProcLoadExistingKey(HWND hwndDlg,UINT msg,WPARAM wPar
 						gpg_thread.~thread();

 						TerminateProcess(params.hProcess, 1);

 						params.hProcess = NULL;

-						debuglog<<time_str()<<": GPG execution timed out, aborted\n";

+						debuglog<<std::string(time_str()+": GPG execution timed out, aborted");

 						break;

 					}

 					if(result == pxNotFound)

@@ -1735,7 +1735,7 @@ static INT_PTR CALLBACK DlgProcLoadExistingKey(HWND hwndDlg,UINT msg,WPARAM wPar
 				  gpg_thread.~thread();

 				  TerminateProcess(params.hProcess, 1);

 				  params.hProcess = NULL;

-				  debuglog<<time_str()<<": GPG execution timed out, aborted\n";

+				  debuglog<<std::string(time_str()+": GPG execution timed out, aborted");

 				  break;

 			  }

 			  if(result == pxNotFound)

@@ -1862,7 +1862,7 @@ static INT_PTR CALLBACK DlgProcImportKeyDialog(HWND hwndDlg, UINT msg, WPARAM wP
 				  gpg_thread.~thread();

 				  TerminateProcess(params.hProcess, 1);

 				  params.hProcess = NULL;

-				  debuglog<<time_str()<<": GPG execution timed out, aborted\n";

+				  debuglog<<std::string(time_str()+": GPG execution timed out, aborted");

 			  }

 			  MessageBoxA(0, out.c_str(), "GPG output", MB_OK);

 		  }

@@ -2024,7 +2024,7 @@ void InitCheck()
 				gpg_thread.~thread();

 				TerminateProcess(params.hProcess, 1);

 				params.hProcess = NULL;

-				debuglog<<time_str()<<": GPG execution timed out, aborted\n";

+				debuglog<<std::string(time_str()+": GPG execution timed out, aborted");

 				return;

 			}

 			if(result == pxNotFound)

@@ -2041,8 +2041,8 @@ void InitCheck()
 		void ShowFirstRunDialog();

 		if(!DBGetContactSettingByte(NULL, szGPGModuleName, "FirstRun", 1) && (!keyid[0] || !key[0]))

 		{

-			question = Translate("You have not set public key for gpg, it's recommended to do it.\nDo you want to do it now ?");

-			if(MessageBoxA(0, question.c_str(), Translate("Own public key warning"), MB_YESNO) == IDYES)

+			question = Translate("You didn't set a private key.\nWould you like to set it now?");

+			if(MessageBoxA(0, question.c_str(), Translate("Own private key warning"), MB_YESNO) == IDYES)

 				ShowFirstRunDialog();

 		}

 		if(out.find(keyid) == string::npos)

@@ -2158,7 +2158,7 @@ void ImportKey()
 			gpg_thread.~thread();

 			TerminateProcess(params.hProcess, 1);

 			params.hProcess = NULL;

-			debuglog<<time_str()<<": GPG execution timed out, aborted\n";

+			debuglog<<std::string(time_str()+": GPG execution timed out, aborted");

 			return;

 		}

 		if(result == pxNotFound)

diff --git a/plugins/New_GPG/src/messages.cpp b/plugins/New_GPG/src/messages.cpp
index 37d67caad8..29fc06e816 100755
--- a/plugins/New_GPG/src/messages.cpp
+++ b/plugins/New_GPG/src/messages.cpp
@@ -40,7 +40,7 @@ void RecvMsgSvc_func(HANDLE hContact, std::wstring str, char *msg, DWORD flags,
 			bool isContactHaveKey(HANDLE hContact);
 			if(!isContactSecured(hContact))
 			{
-				debuglog<<time_str()<<": info: "<<"received message from: "<<(TCHAR*)CallService(MS_CLIST_GETCONTACTDISPLAYNAME, (WPARAM)hContact, GCDNF_TCHAR)<<" with turned off encryption\n";
+				debuglog<<std::string(time_str()+": info: received encrypted message from: "+toUTF8((TCHAR*)CallService(MS_CLIST_GETCONTACTDISPLAYNAME, (WPARAM)hContact, GCDNF_TCHAR))+" with turned off encryption");
 				if(MessageBox(0, TranslateT("We received encrypted message from contact with encryption turned off.\nDo you want turn on encryption for this contact ?"), TranslateT("Warning"), MB_YESNO) == IDYES)
 				{
 					if(!isContactHaveKey(hContact))
@@ -72,6 +72,10 @@ void RecvMsgSvc_func(HANDLE hContact, std::wstring str, char *msg, DWORD flags,
 					return;
 				}
 			}
+			else
+			{
+				debuglog<<std::string(time_str()+": info: received encrypted message from: "+toUTF8((TCHAR*)CallService(MS_CLIST_GETCONTACTDISPLAYNAME, (WPARAM)hContact, GCDNF_TCHAR)));
+			}
 			{
 				wstring::size_type p = 0;
 				while((p = str.find(_T("\r"), p)) != wstring::npos)
@@ -108,13 +112,13 @@ void RecvMsgSvc_func(HANDLE hContact, std::wstring str, char *msg, DWORD flags,
 						dbsetting += "_Password";
 						pass = UniGetContactSettingUtf(NULL, szGPGModuleName, dbsetting.c_str(), _T(""));
 						if(pass[0])
-							debuglog<<time_str()<<": info: found password in database for key id: "<<inkeyid<<", trying to decrypt message from "<<(TCHAR*)CallService(MS_CLIST_GETCONTACTDISPLAYNAME, (WPARAM)hContact, GCDNF_TCHAR)<<" with password\n";
+							debuglog<<std::string(time_str()+": info: found password in database for key id: "+inkeyid+", trying to decrypt message from "+toUTF8((TCHAR*)CallService(MS_CLIST_GETCONTACTDISPLAYNAME, (WPARAM)hContact, GCDNF_TCHAR))+" with password");
 					}
 					else
 					{
 						pass = UniGetContactSettingUtf(NULL, szGPGModuleName, "szKeyPassword", _T(""));
 						if(pass[0])
-							debuglog<<time_str()<<": info: found password for all keys in database, trying to decrypt message from "<<(TCHAR*)CallService(MS_CLIST_GETCONTACTDISPLAYNAME, (WPARAM)hContact, GCDNF_TCHAR)<<" with password\n";
+							debuglog<<std::string(time_str()+": info: found password for all keys in database, trying to decrypt message from "+toUTF8((TCHAR*)CallService(MS_CLIST_GETCONTACTDISPLAYNAME, (WPARAM)hContact, GCDNF_TCHAR))+" with password");
 					}
 					if(pass && pass[0])
 					{
@@ -124,13 +128,13 @@ void RecvMsgSvc_func(HANDLE hContact, std::wstring str, char *msg, DWORD flags,
 					}
 					else if(password && password[0])
 					{
-						debuglog<<time_str()<<": info: found password in memory, trying to decrypt message from "<<(TCHAR*)CallService(MS_CLIST_GETCONTACTDISPLAYNAME, (WPARAM)hContact, GCDNF_TCHAR)<<" with password\n";
+						debuglog<<std::string(time_str()+": info: found password in memory, trying to decrypt message from "+toUTF8((TCHAR*)CallService(MS_CLIST_GETCONTACTDISPLAYNAME, (WPARAM)hContact, GCDNF_TCHAR))+" with password");
 						cmd += _T("--passphrase \"");
 						cmd += password;
 						cmd += _T("\" ");
 					}
 					else
-						debuglog<<time_str()<<": info: passwords not found in database or memory, trying to decrypt message from "<<(TCHAR*)CallService(MS_CLIST_GETCONTACTDISPLAYNAME, (WPARAM)hContact, GCDNF_TCHAR)<<" with out password\n";
+						debuglog<<std::string(time_str()+": info: passwords not found in database or memory, trying to decrypt message from "+toUTF8((TCHAR*)CallService(MS_CLIST_GETCONTACTDISPLAYNAME, (WPARAM)hContact, GCDNF_TCHAR))+" with out password");
 					mir_free(pass);
 					mir_free(inkeyid);
 				}
@@ -161,7 +165,7 @@ void RecvMsgSvc_func(HANDLE hContact, std::wstring str, char *msg, DWORD flags,
 					delete gpg_thread;
 					TerminateProcess(params.hProcess, 1);
 					params.hProcess = NULL;
-					debuglog<<time_str()<<": GPG execution timed out, aborted\n";
+					debuglog<<std::string(time_str()+": GPG execution timed out, aborted");
 					DeleteFile(path.c_str());
 					HistoryLog(hContact, db_event(msg, timestamp, 0, dbflags));
 					BYTE enc = DBGetContactSettingByte(hContact, szGPGModuleName, "GPGEncryption", 0);
@@ -181,7 +185,7 @@ void RecvMsgSvc_func(HANDLE hContact, std::wstring str, char *msg, DWORD flags,
 				_terminate = false;
 				while(out.find("public key decryption failed: bad passphrase") != string::npos)
 				{
-					debuglog<<time_str()<<": info: failed to decrypt messaage from "<<(TCHAR*)CallService(MS_CLIST_GETCONTACTDISPLAYNAME, (WPARAM)hContact, GCDNF_TCHAR)<<" password needed, trying to get one\n";
+					debuglog<<std::string(time_str()+": info: failed to decrypt messaage from "+toUTF8((TCHAR*)CallService(MS_CLIST_GETCONTACTDISPLAYNAME, (WPARAM)hContact, GCDNF_TCHAR))+" password needed, trying to get one");
 					if(_terminate)
 					{
 						BYTE enc = DBGetContactSettingByte(hContact, szGPGModuleName, "GPGEncryption", 0);
@@ -205,7 +209,7 @@ void RecvMsgSvc_func(HANDLE hContact, std::wstring str, char *msg, DWORD flags,
 					wstring cmd2 = cmd;
 					if(password)
 					{
-						debuglog<<time_str()<<": info: found password in memory, trying to decrypt message from "<<(TCHAR*)CallService(MS_CLIST_GETCONTACTDISPLAYNAME, (WPARAM)hContact, GCDNF_TCHAR)<<"\n";
+						debuglog<<std::string(time_str()+": info: found password in memory, trying to decrypt message from "+toUTF8((TCHAR*)CallService(MS_CLIST_GETCONTACTDISPLAYNAME, (WPARAM)hContact, GCDNF_TCHAR)));
 						wstring tmp = _T("--passphrase \"");
 						tmp += password;
 						tmp += _T("\" ");
@@ -225,7 +229,7 @@ void RecvMsgSvc_func(HANDLE hContact, std::wstring str, char *msg, DWORD flags,
 						delete gpg_thread;
 						TerminateProcess(params.hProcess, 1);
 						params.hProcess = NULL;
-						debuglog<<time_str()<<": GPG execution timed out, aborted\n";
+						debuglog<<std::string(time_str()+": GPG execution timed out, aborted");
 						DeleteFile(path.c_str());
 						HistoryLog(hContact, db_event(msg, timestamp, 0, dbflags));
 						BYTE enc = DBGetContactSettingByte(hContact, szGPGModuleName, "GPGEncryption", 0);
@@ -241,7 +245,6 @@ void RecvMsgSvc_func(HANDLE hContact, std::wstring str, char *msg, DWORD flags,
 						HistoryLog(hContact, db_event(msg, timestamp, 0, dbflags));
 						return;
 					}
-					//TODO: check gpg output for errors
 				}
 				out.clear();
 				gpg_thread = new boost::thread(boost::bind(&pxEexcute_thread, &params));
@@ -250,7 +253,7 @@ void RecvMsgSvc_func(HANDLE hContact, std::wstring str, char *msg, DWORD flags,
 					delete gpg_thread;
 					TerminateProcess(params.hProcess, 1);
 					params.hProcess = NULL;
-					debuglog<<time_str()<<": GPG execution timed out, aborted\n";
+					debuglog<<std::string(time_str()+": GPG execution timed out, aborted");
 					DeleteFile(path.c_str());
 					HistoryLog(hContact, db_event(msg, timestamp, 0, dbflags));
 					BYTE enc = DBGetContactSettingByte(hContact, szGPGModuleName, "GPGEncryption", 0);
@@ -265,7 +268,6 @@ void RecvMsgSvc_func(HANDLE hContact, std::wstring str, char *msg, DWORD flags,
 					DeleteFile(path.c_str());
 					HistoryLog(hContact, db_event(msg, timestamp, 0, dbflags));
 				}
-				//TODO: check gpg output for errors
 				{
 					wstring tmp = tmp2;
 					tmp += _T("\\tmp\\");
@@ -282,7 +284,7 @@ void RecvMsgSvc_func(HANDLE hContact, std::wstring str, char *msg, DWORD flags,
 						{
 							string str = msg;
 							str.insert(0, "Received unencrypted message:\n");
-							debuglog<<time_str()<<": info: Failed to decrypt GPG encrypted message.\n";
+							debuglog<<std::string(time_str()+": info: Failed to decrypt GPG encrypted message.");
 							char *tmp = new char [str.length()+1];
 							strcpy(tmp, str.c_str());
 							HistoryLog(hContact, db_event(msg, timestamp, 0, dbflags));
@@ -320,7 +322,7 @@ void RecvMsgSvc_func(HANDLE hContact, std::wstring str, char *msg, DWORD flags,
 					{
 						string str = msg;
 						str.insert(0, "Failed to decrypt GPG encrypted message.\nMessage body for manual decryption:\n");
-						debuglog<<time_str()<<": info: Failed to decrypt GPG encrypted message.\n";
+						debuglog<<std::string(time_str()+": info: Failed to decrypt GPG encrypted message.");
 						char *tmp = mir_strdup(str.c_str());
 						HistoryLog(hContact, db_event(msg, timestamp, 0, dbflags));
 						BYTE enc = DBGetContactSettingByte(hContact, szGPGModuleName, "GPGEncryption", 0);
@@ -388,16 +390,21 @@ int RecvMsgSvc(WPARAM w, LPARAM l)
 		if(!strstr(msg, "-----BEGIN PGP MESSAGE-----"))
 			return CallService(MS_PROTO_CHAINRECV, w, l);
 		else
+		{
+			debuglog<<std::string(time_str()+": info: blocked pgp message to metacontact:"+toUTF8((TCHAR*)CallService(MS_CLIST_GETCONTACTDISPLAYNAME, (WPARAM)ccs->hContact, GCDNF_TCHAR)));
 			return 0;
+		}
 	}
 	wstring str = toUTF16(msg);
 	wstring::size_type s1 = wstring::npos, s2 = wstring::npos;
 	if(bAutoExchange && (str.find(_T("-----PGP KEY RESPONSE-----")) != wstring::npos))
 	{
+		debuglog<<std::string(time_str()+": info(autoexchange): parsing key response:"+toUTF8((TCHAR*)CallService(MS_CLIST_GETCONTACTDISPLAYNAME, (WPARAM)ccs->hContact, GCDNF_TCHAR)));
 		s2 = str.find(_T("-----END PGP PUBLIC KEY BLOCK-----"));
 		s1 = str.find(_T("-----BEGIN PGP PUBLIC KEY BLOCK-----"));
 		if(s1 != wstring::npos && s2 != wstring::npos)
 		{
+			debuglog<<std::string(time_str()+": info(autoexchange): found pubkey block:"+toUTF8((TCHAR*)CallService(MS_CLIST_GETCONTACTDISPLAYNAME, (WPARAM)ccs->hContact, GCDNF_TCHAR)));
 			s2 += _tcslen(_T("-----END PGP PUBLIC KEY BLOCK-----"));
 			DBWriteContactSettingTString(ccs->hContact, szGPGModuleName, "GPGPubKey", str.substr(s1,s2-s1).c_str());
 			{ //gpg execute block
@@ -443,13 +450,12 @@ int RecvMsgSvc(WPARAM w, LPARAM l)
 					gpg_thread.~thread();
 					TerminateProcess(params.hProcess, 1);
 					params.hProcess = NULL;
-					debuglog<<time_str()<<": GPG execution timed out, aborted\n";
+					debuglog<<std::string(time_str()+": GPG execution timed out, aborted");
 					return 1;
 				}
 				if(result == pxNotFound)
 					return 1;
 				DeleteFile(tmp2);
-				//TODO: check gpg output for errors
 				{
 					char *tmp = NULL;
 					string::size_type s = output.find("gpg: key ") + strlen("gpg: key ");
@@ -519,33 +525,24 @@ int RecvMsgSvc(WPARAM w, LPARAM l)
 				return 1;
 			}
 		}
-		if((str.find(_T("-----END PGP PUBLIC KEY BLOCK-----")) != wstring::npos) && (str.find(_T("-----BEGIN PGP PUBLIC KEY BLOCK-----")) != wstring::npos))
-		{
-			s2 = str.find(_T("-----END PGP PUBLIC KEY BLOCK-----"));
-			s1 = str.find(_T("-----BEGIN PGP PUBLIC KEY BLOCK-----"));
-		}
-		else if((str.find(_T("-----BEGIN PGP PRIVATE KEY BLOCK-----")) != wstring::npos) && (str.find(_T("-----END PGP PRIVATE KEY BLOCK-----")) != wstring::npos))
+		if(((s2 = str.find(_T("-----END PGP PUBLIC KEY BLOCK-----"))) == wstring::npos) || ((s1 = str.find(_T("-----BEGIN PGP PUBLIC KEY BLOCK-----"))) == wstring::npos))
 		{
 			s2 = str.find(_T("-----END PGP PRIVATE KEY BLOCK-----"));
 			s1 = str.find(_T("-----BEGIN PGP PRIVATE KEY BLOCK-----"));
 		}
 		if((s2 != wstring::npos) && (s1 != wstring::npos))
 		{  //this is public key
-			debuglog<<time_str()<<": info: "<<"received key from: "<<(TCHAR*)CallService(MS_CLIST_GETCONTACTDISPLAYNAME, (WPARAM)ccs->hContact, GCDNF_TCHAR)<<"\n";
+			debuglog<<std::string(time_str()+": info: received key from: "+toUTF8((TCHAR*)CallService(MS_CLIST_GETCONTACTDISPLAYNAME, (WPARAM)ccs->hContact, GCDNF_TCHAR)));
 			s1 = 0;
 			while((s1 = str.find(_T("\r"), s1)) != wstring::npos)
 				str.erase(s1, 1);
 			void ShowNewKeyDialog();
-			if((str.find(_T("-----END PGP PUBLIC KEY BLOCK-----")) != wstring::npos) && (str.find(_T("-----BEGIN PGP PUBLIC KEY BLOCK-----")) != wstring::npos))
+			if(((s2 = str.find(_T("-----END PGP PUBLIC KEY BLOCK-----"))) != wstring::npos) && ((s1 = str.find(_T("-----BEGIN PGP PUBLIC KEY BLOCK-----"))) != wstring::npos))
 			{
-				s2 = str.find(_T("-----END PGP PUBLIC KEY BLOCK-----"));
-				s1 = str.find(_T("-----BEGIN PGP PUBLIC KEY BLOCK-----"));
 				s2 += _tcslen(_T("-----END PGP PUBLIC KEY BLOCK-----"));
 			}
-			else if((str.find(_T("-----BEGIN PGP PRIVATE KEY BLOCK-----")) != wstring::npos) && (str.find(_T("-----END PGP PRIVATE KEY BLOCK-----")) != wstring::npos))
+			else if(((s2 = str.find(_T("-----BEGIN PGP PRIVATE KEY BLOCK-----"))) != wstring::npos) && ((s1 = str.find(_T("-----END PGP PRIVATE KEY BLOCK-----"))) != wstring::npos))
 			{
-				s2 = str.find(_T("-----END PGP PRIVATE KEY BLOCK-----"));
-				s1 = str.find(_T("-----BEGIN PGP PRIVATE KEY BLOCK-----"));
 				s2 += _tcslen(_T("-----END PGP PRIVATE KEY BLOCK-----"));
 			}
 			new_key.append(str.substr(s1,s2-s1));
@@ -557,6 +554,7 @@ int RecvMsgSvc(WPARAM w, LPARAM l)
 		}
 		if(bAutoExchange && strstr(msg, "-----PGP KEY REQUEST-----") && gpg_valid && gpg_keyexist)
 		{
+			debuglog<<std::string(time_str()+": info(autoexchange): received key request from: "+toUTF8((TCHAR*)CallService(MS_CLIST_GETCONTACTDISPLAYNAME, (WPARAM)ccs->hContact, GCDNF_TCHAR)));
 			char *tmp = UniGetContactSettingUtf(NULL, szGPGModuleName, "GPGPubKey", "");
 			if(tmp[0])
 			{
@@ -639,6 +637,7 @@ void SendMsgSvc_func(HANDLE hContact, char *msg, DWORD flags)
 		str = toUTF16(msg);
 	else
 	{//workaround ...
+		debuglog<<std::string(time_str()+": info: using workaround for codepage with metacontacts, name: "+ toUTF8((TCHAR*)CallService(MS_CLIST_GETCONTACTDISPLAYNAME, (WPARAM)hContact, GCDNF_TCHAR)));
 		wchar_t *tmp = mir_utf8decodeW(msg);
 		if(!tmp)
 		{
@@ -650,6 +649,7 @@ void SendMsgSvc_func(HANDLE hContact, char *msg, DWORD flags)
 	}
 	if(bStripTags && bAppendTags)
 	{
+		debuglog<<std::string(time_str()+": info: stripping tags in outgoing message, name: "+toUTF8((TCHAR*)CallService(MS_CLIST_GETCONTACTDISPLAYNAME, (WPARAM)hContact, GCDNF_TCHAR)));
 		strip_tags(str);
 	}
 /*	for(std::wstring::size_type i = str.find(_T("\r\n")); i != std::wstring::npos; i = str.find(_T("\r\n"), i+1))
@@ -692,7 +692,10 @@ void SendMsgSvc_func(HANDLE hContact, char *msg, DWORD flags)
 	{
 		fstream f(path.c_str(), std::ios::out);
 		while(!f.is_open())
+		{
+			boost::this_thread::sleep(boost::posix_time::milliseconds(50));
 			f.open(path.c_str(), std::ios::out);
+		}
 		std::string tmp = toUTF8(str);
 		f.write(tmp.c_str(), tmp.size());
 		f.close();
@@ -710,7 +713,7 @@ void SendMsgSvc_func(HANDLE hContact, char *msg, DWORD flags)
 		gpg_thread.~thread();
 		TerminateProcess(params.hProcess, 1);
 		params.hProcess = NULL;
-		debuglog<<time_str()<<": GPG execution timed out, aborted\n";
+		debuglog<<std::string(time_str()+": GPG execution timed out, aborted");
 		mir_free(msg);
 		CallContactService(hContact, PSS_MESSAGE, (WPARAM)flags, (LPARAM)msg);
 		return;
@@ -742,7 +745,7 @@ void SendMsgSvc_func(HANDLE hContact, char *msg, DWORD flags)
 				gpg_thread.~thread();
 				TerminateProcess(params.hProcess, 1);
 				params.hProcess = NULL;
-				debuglog<<time_str()<<": GPG execution timed out, aborted\n";
+				debuglog<<std::string(time_str()+": GPG execution timed out, aborted");
 				mir_free(msg);
 				CallContactService(hContact, PSS_MESSAGE, (WPARAM)flags, (LPARAM)msg);
 				return;
@@ -794,7 +797,7 @@ void SendMsgSvc_func(HANDLE hContact, char *msg, DWORD flags)
 	{
 		HistoryLog(hContact, db_event("Failed to encrypt message with GPG", 0,0, DBEF_SENT));
 		hcontact_data[hContact].msgs_to_pass.push_back("Failed to encrypt message with GPG");
-		debuglog<<time_str()<<": info: Failed to encrypt message with GPG\n";
+		debuglog<<std::string(time_str()+": info: Failed to encrypt message with GPG");
 		mir_free(msg);
 		CallContactService(hContact, PSS_MESSAGE, (WPARAM)flags, (LPARAM)msg);
 		return;
@@ -813,7 +816,7 @@ void SendMsgSvc_func(HANDLE hContact, char *msg, DWORD flags)
 		HistoryLog(metaGetContact(hContact), db_event((char*)str_event.c_str(), 0,0, DBEF_SENT|dbflags));
 	} */ //unneeded ?
 	hcontact_data[hContact].msgs_to_pass.push_back(str_event);
-	debuglog<<time_str()<<": adding event to contact: "<<(TCHAR*)CallService(MS_CLIST_GETCONTACTDISPLAYNAME, (WPARAM)hContact, GCDNF_TCHAR)<<" on send message.\n";
+	debuglog<<std::string(time_str()+": adding event to contact: "+toUTF8((TCHAR*)CallService(MS_CLIST_GETCONTACTDISPLAYNAME, (WPARAM)hContact, GCDNF_TCHAR))+" on send message.");
 	HistoryLog(hContact, db_event((char*)str_event.c_str(), 0,0, dbflags|DBEF_SENT));
 	if(!(flags & PREF_UTF))
 		flags |= PREF_UTF; 
@@ -831,20 +834,27 @@ int SendMsgSvc(WPARAM w, LPARAM l)
 	char *msg = mir_strdup((char*)(ccs->lParam));
 	if (!msg)
 	{
+		debuglog<<std::string(time_str()+": info: failed to get message data, name: "+toUTF8((TCHAR*)CallService(MS_CLIST_GETCONTACTDISPLAYNAME, (WPARAM)ccs->hContact, GCDNF_TCHAR)));
 		mir_free(msg);
 		return CallService(MS_PROTO_CHAINSEND, w, l);
 	}
 	if(strstr(msg,"-----BEGIN PGP MESSAGE-----"))
+	{
+		debuglog<<std::string(time_str()+": info: encrypted messge, let it go, name: "+toUTF8((TCHAR*)CallService(MS_CLIST_GETCONTACTDISPLAYNAME, (WPARAM)ccs->hContact, GCDNF_TCHAR)));
 		return CallService(MS_PROTO_CHAINSEND, w, l);
+	}
 	if(!isContactHaveKey(ccs->hContact))
 	{
+		debuglog<<std::string(time_str()+": info: contact have not key, name: "+toUTF8((TCHAR*)CallService(MS_CLIST_GETCONTACTDISPLAYNAME, (WPARAM)ccs->hContact, GCDNF_TCHAR)));
 		if(bAutoExchange && !strstr(msg, "-----PGP KEY REQUEST-----") && !strstr(msg, "-----BEGIN PGP PUBLIC KEY BLOCK-----") && gpg_valid)
 		{
+			debuglog<<std::string(time_str()+": info: checking for autoexchange possibility, name: "+toUTF8((TCHAR*)CallService(MS_CLIST_GETCONTACTDISPLAYNAME, (WPARAM)ccs->hContact, GCDNF_TCHAR)));
 			void send_encrypted_msgs_thread(HANDLE hContact);
 			LPSTR proto = GetContactProto(ccs->hContact);
 			DWORD uin = DBGetContactSettingDword(ccs->hContact, proto, "UIN", 0);
 			if(uin)
 			{
+				debuglog<<std::string(time_str()+": info(autoexchange): protocol looks like icq, name: "+toUTF8((TCHAR*)CallService(MS_CLIST_GETCONTACTDISPLAYNAME, (WPARAM)ccs->hContact, GCDNF_TCHAR)));
 				char *proto = GetContactProto(ccs->hContact);
 				char svc[64];
 				strcpy(svc, proto);
@@ -852,10 +862,12 @@ int SendMsgSvc(WPARAM w, LPARAM l)
 
 				if(ServiceExists(svc))
 				{
+					debuglog<<std::string(time_str()+": info(autoexchange, icq): checking for autoexchange icq capability, name: "+toUTF8((TCHAR*)CallService(MS_CLIST_GETCONTACTDISPLAYNAME, (WPARAM)ccs->hContact, GCDNF_TCHAR)));
 					ICQ_CUSTOMCAP cap = {0};
 					strcpy(cap.caps, "GPG AutoExchange");
 					if(CallService(svc, (WPARAM)ccs->hContact, (LPARAM)&cap))
 					{
+						debuglog<<std::string(time_str()+": info(autoexchange, icq): sending key requiest, name: "+toUTF8((TCHAR*)CallService(MS_CLIST_GETCONTACTDISPLAYNAME, (WPARAM)ccs->hContact, GCDNF_TCHAR)));
 						CallContactService(ccs->hContact, PSS_MESSAGE, (WPARAM)ccs->wParam, (LPARAM)"-----PGP KEY REQUEST-----");
 						hcontact_data[ccs->hContact].msgs_to_send.push_back(msg);
 						boost::thread *thr = new boost::thread(boost::bind(send_encrypted_msgs_thread, ccs->hContact));
@@ -869,6 +881,7 @@ int SendMsgSvc(WPARAM w, LPARAM l)
 				TCHAR *jid = UniGetContactSettingUtf(ccs->hContact, proto, "jid", _T(""));
 				if(jid[0])
 				{
+					debuglog<<std::string(time_str()+": info(autoexchange): protocol looks like jabber, name: "+toUTF8((TCHAR*)CallService(MS_CLIST_GETCONTACTDISPLAYNAME, (WPARAM)ccs->hContact, GCDNF_TCHAR)));
 					extern list <JabberAccount*> Accounts;
 					list<JabberAccount*>::iterator end = Accounts.end();
 					for(list<JabberAccount*>::iterator p = Accounts.begin(); p != end; p++)
@@ -887,6 +900,7 @@ int SendMsgSvc(WPARAM w, LPARAM l)
 							mir_free(caps);
 							if(str.find(_T("GPG_Key_Auto_Exchange:0")) != string::npos)
 							{
+								debuglog<<std::string(time_str()+": info(autoexchange, jabber): autoexchange capability found, sending key request, name: "+toUTF8((TCHAR*)CallService(MS_CLIST_GETCONTACTDISPLAYNAME, (WPARAM)ccs->hContact, GCDNF_TCHAR)));
 								CallContactService(ccs->hContact, PSS_MESSAGE, (WPARAM)ccs->wParam, (LPARAM)"-----PGP KEY REQUEST-----");
 								hcontact_data[ccs->hContact].msgs_to_send.push_back(msg);
 								boost::thread *thr = new boost::thread(boost::bind(send_encrypted_msgs_thread, ccs->hContact));
@@ -904,8 +918,13 @@ int SendMsgSvc(WPARAM w, LPARAM l)
 			return CallService(MS_PROTO_CHAINSEND, w, l);
 		}
 	}
+	else
+		debuglog<<std::string(time_str()+": info: contact have key, name: "+toUTF8((TCHAR*)CallService(MS_CLIST_GETCONTACTDISPLAYNAME, (WPARAM)ccs->hContact, GCDNF_TCHAR)));
+	if(metaIsProtoMetaContacts(ccs->hContact))
+		debuglog<<std::string(time_str()+": info: protocol is metacontacts, name: "+toUTF8((TCHAR*)CallService(MS_CLIST_GETCONTACTDISPLAYNAME, (WPARAM)ccs->hContact, GCDNF_TCHAR)));
 	if(!isContactSecured(ccs->hContact) || metaIsProtoMetaContacts(ccs->hContact))
 	{
+		debuglog<<std::string(time_str()+": info: contact not secured, name: "+toUTF8((TCHAR*)CallService(MS_CLIST_GETCONTACTDISPLAYNAME, (WPARAM)ccs->hContact, GCDNF_TCHAR)));
 		mir_free(msg);
 		return CallService(MS_PROTO_CHAINSEND, w, l);
 	}
@@ -926,9 +945,15 @@ int HookSendMsg(WPARAM w, LPARAM l)
 	if(dbei->flags & DBEF_SENT)
 	{
 		if(isContactSecured(hContact) && strstr((char*)dbei->pBlob, "-----BEGIN PGP MESSAGE-----")) //our service data, can be double added by metacontacts e.t.c.
+		{
+			debuglog<<std::string(time_str()+": info(send handler): block pgp message event, name: "+toUTF8((TCHAR*)CallService(MS_CLIST_GETCONTACTDISPLAYNAME, (WPARAM)hContact, GCDNF_TCHAR)));
 			return 1;
+		}
 		if(bAutoExchange && (strstr((char*)dbei->pBlob, "-----PGP KEY RESPONSE-----") || strstr((char*)dbei->pBlob, "-----PGP KEY REQUEST-----"))) ///do not show service data in history
+		{
+			debuglog<<std::string(time_str()+": info(send handler): block pgp key request/response event, name: "+toUTF8((TCHAR*)CallService(MS_CLIST_GETCONTACTDISPLAYNAME, (WPARAM)hContact, GCDNF_TCHAR)));
 			return 1;
+		}
 	}
 	if(isContactSecured(hContact) && (dbei->flags & DBEF_SENT)) //aggressive outgoing events filtering
 	{
@@ -941,7 +966,7 @@ int HookSendMsg(WPARAM w, LPARAM l)
 				if(!strcmp((*i).c_str(), (char*)dbei->pBlob))
 				{
 					hcontact_data[hContact].msgs_to_pass.erase(i);
-					debuglog<<time_str()<<": event message: \""<<(char*)dbei->pBlob<<"\" passed event filter, contact "<<(TCHAR*)CallService(MS_CLIST_GETCONTACTDISPLAYNAME, (WPARAM)hContact, GCDNF_TCHAR)<<", message is in allowed list\n";
+					debuglog<<std::string(time_str()+": event message: \""+(char*)dbei->pBlob+"\" passed event filter, contact "+toUTF8((TCHAR*)CallService(MS_CLIST_GETCONTACTDISPLAYNAME, (WPARAM)hContact, GCDNF_TCHAR))+", message is in allowed list");
 					event_processing_mutex.unlock();
 					return 0;
 				}
@@ -954,7 +979,7 @@ int HookSendMsg(WPARAM w, LPARAM l)
 	}
 	if(!isContactSecured(hContact))
 	{
-		debuglog<<time_str()<<": event message: \""<<(char*)dbei->pBlob<<"\" passed event filter, contact "<<(TCHAR*)CallService(MS_CLIST_GETCONTACTDISPLAYNAME, (WPARAM)hContact, GCDNF_TCHAR)<<" is unsecured\n";
+		debuglog<<std::string(time_str()+": event message: \""+(char*)dbei->pBlob+"\" passed event filter, contact "+toUTF8((TCHAR*)CallService(MS_CLIST_GETCONTACTDISPLAYNAME, (WPARAM)hContact, GCDNF_TCHAR))+" is unsecured");
 		return 0;
 	}
 	if(!(dbei->flags & DBEF_SENT) && metaIsProtoMetaContacts((HANDLE)w))
@@ -963,7 +988,10 @@ int HookSendMsg(WPARAM w, LPARAM l)
 		strncpy(tmp, (char*)dbei->pBlob, 27);
 		tmp[28] = '\0';
 		if(strstr(tmp, "-----BEGIN PGP MESSAGE-----"))
+		{
+			debuglog<<std::string(time_str()+": info(send handler): block pgp message event, name: "+toUTF8((TCHAR*)CallService(MS_CLIST_GETCONTACTDISPLAYNAME, (WPARAM)hContact, GCDNF_TCHAR)));
 			return 1;
+		}
 	}
 	return 0;
 }
diff --git a/plugins/New_GPG/src/options.cpp b/plugins/New_GPG/src/options.cpp
index 1030595e00..9d4e1da893 100755
--- a/plugins/New_GPG/src/options.cpp
+++ b/plugins/New_GPG/src/options.cpp
@@ -278,7 +278,7 @@ static INT_PTR CALLBACK DlgProcGpgOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LP
 						  gpg_thread.~thread();
 						  TerminateProcess(params.hProcess, 1);
 						  params.hProcess = NULL;
-						  debuglog<<time_str()<<": GPG execution timed out, aborted\n";
+						  debuglog<<std::string(time_str()+": GPG execution timed out, aborted");
 						  mir_free(tmp);
 						  break;
 					  }
@@ -843,7 +843,7 @@ static INT_PTR CALLBACK DlgProcLoadPublicKey(HWND hwndDlg,UINT msg,WPARAM wParam
 						gpg_thread.~thread();
 						TerminateProcess(params.hProcess, 1);
 						params.hProcess = NULL;
-						debuglog<<time_str()<<": GPG execution timed out, aborted\n";
+						debuglog<<std::string(time_str()+": GPG execution timed out, aborted");
 					}
 					if((out.find("-----BEGIN PGP PUBLIC KEY BLOCK-----") != string::npos) && (out.find("-----END PGP PUBLIC KEY BLOCK-----") != string::npos))
 					{
@@ -996,7 +996,7 @@ static INT_PTR CALLBACK DlgProcLoadPublicKey(HWND hwndDlg,UINT msg,WPARAM wParam
 					  gpg_thread.~thread();
 					  TerminateProcess(params.hProcess, 1);
 					  params.hProcess = NULL;
-					  debuglog<<time_str()<<": GPG execution timed out, aborted\n";
+					  debuglog<<std::string(time_str()+": GPG execution timed out, aborted");
 					  break;
 				  }
 				  if(result == pxNotFound)
@@ -1243,7 +1243,7 @@ static INT_PTR CALLBACK DlgProcLoadPublicKey(HWND hwndDlg,UINT msg,WPARAM wParam
 							  gpg_thread.~thread();
 							  TerminateProcess(params.hProcess, 1);
 							  params.hProcess = NULL;
-							  debuglog<<time_str()<<": GPG execution timed out, aborted\n";
+							  debuglog<<std::string(time_str()+": GPG execution timed out, aborted");
 							  break;
 						  }
 						  if(result == pxNotFound)
@@ -1330,7 +1330,7 @@ static INT_PTR CALLBACK DlgProcLoadPublicKey(HWND hwndDlg,UINT msg,WPARAM wParam
 			  if(key_buf.empty())
 			  {
 				  key_buf.clear();
-				  debuglog<<time_str()<<": info: Failed to read key file\n";
+				  debuglog<<std::string(time_str()+": info: Failed to read key file");
 				  break;
 			  }
 			  ws2 = key_buf.find(_T("-----END PGP PUBLIC KEY BLOCK-----"));
diff --git a/plugins/New_GPG/src/utilities.cpp b/plugins/New_GPG/src/utilities.cpp
index adb50e4c2d..f8ad62e31f 100755
--- a/plugins/New_GPG/src/utilities.cpp
+++ b/plugins/New_GPG/src/utilities.cpp
@@ -357,13 +357,13 @@ int onProtoAck(WPARAM w, LPARAM l)
 								dbsetting += "_Password";

 								pass = UniGetContactSettingUtf(NULL, szGPGModuleName, dbsetting.c_str(), _T(""));

 								if(_tcslen(pass) > 0)

-									debuglog<<time_str()<<": info: found password in database for key id: "<<keyid<<", trying to decrypt message from "<<(TCHAR*)CallService(MS_CLIST_GETCONTACTDISPLAYNAME, (WPARAM)ack->hContact, GCDNF_TCHAR)<<" with password\n";

+									debuglog<<std::string(time_str()+": info: found password in database for key id: "+keyid+", trying to decrypt message from "+toUTF8((TCHAR*)CallService(MS_CLIST_GETCONTACTDISPLAYNAME, (WPARAM)ack->hContact, GCDNF_TCHAR))+" with password");

 							}

 							else

 							{

 								pass = UniGetContactSettingUtf(NULL, szGPGModuleName, "szKeyPassword", _T(""));

 								if(_tcslen(pass) > 0)

-									debuglog<<time_str()<<": info: found password for all keys in database, trying to decrypt message from "<<(TCHAR*)CallService(MS_CLIST_GETCONTACTDISPLAYNAME, (WPARAM)ack->hContact, GCDNF_TCHAR)<<" with password\n";

+									debuglog<<std::string(time_str()+": info: found password for all keys in database, trying to decrypt message from "+toUTF8((TCHAR*)CallService(MS_CLIST_GETCONTACTDISPLAYNAME, (WPARAM)ack->hContact, GCDNF_TCHAR))+" with password");

 							}

 							if(_tcslen(pass) > 0)

 							{

@@ -373,13 +373,13 @@ int onProtoAck(WPARAM w, LPARAM l)
 							}

 							else if(password)

 							{

-								debuglog<<time_str()<<": info: found password in memory, trying to decrypt message from "<<(TCHAR*)CallService(MS_CLIST_GETCONTACTDISPLAYNAME, (WPARAM)ack->hContact, GCDNF_TCHAR)<<" with password\n";

+								debuglog<<std::string(time_str()+": info: found password in memory, trying to decrypt message from "+toUTF8((TCHAR*)CallService(MS_CLIST_GETCONTACTDISPLAYNAME, (WPARAM)ack->hContact, GCDNF_TCHAR))+" with password");

 								cmd += _T("--passphrase \"");

 								cmd += password;

 								cmd += _T("\" ");

 							}

 							else

-								debuglog<<time_str()<<": info: passwords not found in database or memory, trying to decrypt message from "<<(TCHAR*)CallService(MS_CLIST_GETCONTACTDISPLAYNAME, (WPARAM)ack->hContact, GCDNF_TCHAR)<<" with out password\n";

+								debuglog<<std::string(time_str()+": info: passwords not found in database or memory, trying to decrypt message from "+toUTF8((TCHAR*)CallService(MS_CLIST_GETCONTACTDISPLAYNAME, (WPARAM)ack->hContact, GCDNF_TCHAR))+" with out password");

 							mir_free(pass);

 							mir_free(keyid);

 						}

@@ -398,7 +398,7 @@ int onProtoAck(WPARAM w, LPARAM l)
 							delete gpg_thread;

 							TerminateProcess(params.hProcess, 1);

 							params.hProcess = NULL;

-							debuglog<<time_str()<<": GPG execution timed out, aborted\n";

+							debuglog<<std::string(time_str()+": GPG execution timed out, aborted");

 							return 0;

 						}

 						while(out.find("public key decryption failed: bad passphrase") != string::npos)

@@ -406,7 +406,7 @@ int onProtoAck(WPARAM w, LPARAM l)
 							extern bool _terminate;

 							extern HANDLE new_key_hcnt;

 							extern boost::mutex new_key_hcnt_mutex;

-							debuglog<<time_str()<<": info: failed to decrypt messaage from "<<(TCHAR*)CallService(MS_CLIST_GETCONTACTDISPLAYNAME, (WPARAM)ack->hContact, GCDNF_TCHAR)<<" password needed, trying to get one\n";

+							debuglog<<std::string(time_str()+": info: failed to decrypt messaage from "+toUTF8((TCHAR*)CallService(MS_CLIST_GETCONTACTDISPLAYNAME, (WPARAM)ack->hContact, GCDNF_TCHAR))+" password needed, trying to get one");

 							if(_terminate)

 								break;

 							{ //save inkey id

@@ -426,7 +426,7 @@ int onProtoAck(WPARAM w, LPARAM l)
 							wstring cmd2 = cmd;

 							if(password)

 							{

-								debuglog<<time_str()<<": info: found password in memory, trying to decrypt message from "<<(TCHAR*)CallService(MS_CLIST_GETCONTACTDISPLAYNAME, (WPARAM)ack->hContact, GCDNF_TCHAR)<<"\n";

+								debuglog<<std::string(time_str()+": info: found password in memory, trying to decrypt message from "+toUTF8((TCHAR*)CallService(MS_CLIST_GETCONTACTDISPLAYNAME, (WPARAM)ack->hContact, GCDNF_TCHAR)));

 								wstring tmp = _T("--passphrase \"");

 								tmp += password;

 								tmp += _T("\" ");

@@ -446,7 +446,7 @@ int onProtoAck(WPARAM w, LPARAM l)
 								delete gpg_thread;

 								TerminateProcess(params.hProcess, 1);

 								params.hProcess = NULL;

-								debuglog<<time_str()<<": GPG execution timed out, aborted\n";

+								debuglog<<std::string(time_str()+": GPG execution timed out, aborted");

 								//DeleteFile(filename);

 								return 0;

 							}

@@ -537,7 +537,7 @@ std::wstring encrypt_file(HANDLE hContact, TCHAR *filename)
 		delete gpg_thread;

 		TerminateProcess(params.hProcess, 1);

 		params.hProcess = NULL;

-		debuglog<<time_str()<<": GPG execution timed out, aborted\n";

+		debuglog<<std::string(time_str()+": GPG execution timed out, aborted");

 		return 0;

 	}

 	if(out.find("There is no assurance this key belongs to the named user") != string::npos)

@@ -553,7 +553,7 @@ std::wstring encrypt_file(HANDLE hContact, TCHAR *filename)
 				delete gpg_thread;

 				TerminateProcess(params.hProcess, 1);

 				params.hProcess = NULL;

-				debuglog<<time_str()<<": GPG execution timed out, aborted\n";

+				debuglog<<std::string(time_str()+": GPG execution timed out, aborted");

 				return 0;

 			}

 		}

@@ -769,7 +769,7 @@ static JABBER_HANDLER_FUNC SendHandler(IJabberInterface *ji, HXML node, void *pU
 				{

 					if(errno == ENOENT)

 					{

-						debuglog<<time_str()<<": info: Failed to write prescense in file\n";

+						debuglog<<std::string(time_str()+": info: Failed to write prescense in file");

 						return FALSE;

 					}

 				}

@@ -800,13 +800,13 @@ static JABBER_HANDLER_FUNC SendHandler(IJabberInterface *ji, HXML node, void *pU
 							dbsetting += "_Password";

 							pass = UniGetContactSettingUtf(NULL, szGPGModuleName, dbsetting.c_str(), _T(""));

 							if(pass[0])

-								debuglog<<time_str()<<": info: found password in database for key id: "<<inkeyid<<", trying to encrypt message from self with password\n";

+								debuglog<<std::string(time_str()+": info: found password in database for key id: "+inkeyid+", trying to encrypt message from self with password");

 						}

 						else

 						{

 							pass = UniGetContactSettingUtf(NULL, szGPGModuleName, "szKeyPassword", _T(""));

 							if(pass[0])

-								debuglog<<time_str()<<": info: found password for all keys in database, trying to encrypt message from self with password\n";

+								debuglog<<std::string(time_str()+": info: found password for all keys in database, trying to encrypt message from self with password");

 						}

 						if(pass[0])

 						{

@@ -816,13 +816,13 @@ static JABBER_HANDLER_FUNC SendHandler(IJabberInterface *ji, HXML node, void *pU
 						}

 						else if(password)

 						{

-							debuglog<<time_str()<<": info: found password in memory, trying to encrypt message from self with password\n";

+							debuglog<<std::string(time_str()+": info: found password in memory, trying to encrypt message from self with password");

 							cmd += _T("--passphrase \"");

 							cmd += password;

 							cmd += _T("\" ");

 						}

 						else

-							debuglog<<time_str()<<": info: passwords not found in database or memory, trying to encrypt message from self with out password\n";

+							debuglog<<std::string(time_str()+": info: passwords not found in database or memory, trying to encrypt message from self with out password");

 						mir_free(pass);

 						mir_free(inkeyid);

 					}

@@ -848,7 +848,7 @@ static JABBER_HANDLER_FUNC SendHandler(IJabberInterface *ji, HXML node, void *pU
 						gpg_thread.~thread();

 						TerminateProcess(params.hProcess, 1);

 						params.hProcess = NULL;

-						debuglog<<time_str()<<"GPG execution timed out, aborted\n";

+						debuglog<<std::string(time_str()+"GPG execution timed out, aborted");

 					}

 					DeleteFile(path_out.c_str());

 					path_out += _T(".asc");

@@ -868,7 +868,7 @@ static JABBER_HANDLER_FUNC SendHandler(IJabberInterface *ji, HXML node, void *pU
 					}

 					if(data.empty())

 					{

-						debuglog<<time_str()<<": info: Failed to read prescense sign from file\n";

+						debuglog<<std::string(time_str()+": info: Failed to read prescense sign from file");

 						return FALSE;

 					}

 					if(data.find(_T("-----BEGIN PGP SIGNATURE-----")) != wstring::npos && data.find(_T("-----END PGP SIGNATURE-----")) != wstring::npos)

@@ -983,7 +983,7 @@ static JABBER_HANDLER_FUNC PrescenseHandler(IJabberInterface *ji, HXML node, voi
 							if(errno == ENOENT)

 							{

 //								sign_file_mutex.unlock();

-								debuglog<<time_str()<<": info: Failed to write sign in file\n";

+								debuglog<<std::string(time_str()+": info: Failed to write sign in file");

 								return FALSE;

 							}

 						}

@@ -1009,7 +1009,7 @@ static JABBER_HANDLER_FUNC PrescenseHandler(IJabberInterface *ji, HXML node, voi
 								gpg_thread.~thread();

 								TerminateProcess(params.hProcess, 1);

 								params.hProcess = NULL;

-								debuglog<<time_str()<<": GPG execution timed out, aborted\n";

+								debuglog<<std::string(time_str()+": GPG execution timed out, aborted");

 								return FALSE;

 							}

 							if(result == pxNotFound)

@@ -1086,7 +1086,7 @@ bool isContactSecured(HANDLE hContact)
 	BYTE gpg_enc = DBGetContactSettingByte(hContact, szGPGModuleName, "GPGEncryption", 0);

 	if(!gpg_enc)

 	{

-		debuglog<<time_str()<<": encryption is turned off for "<<(TCHAR*)CallService(MS_CLIST_GETCONTACTDISPLAYNAME, (WPARAM)hContact, GCDNF_TCHAR)<<"\n";

+		debuglog<<std::string(time_str()+": encryption is turned off for "+toUTF8((TCHAR*)CallService(MS_CLIST_GETCONTACTDISPLAYNAME, (WPARAM)hContact, GCDNF_TCHAR)));

 		return false;

 	}

 	if(!metaIsProtoMetaContacts(hContact))

@@ -1095,12 +1095,12 @@ bool isContactSecured(HANDLE hContact)
 		if(!key[0])

 		{

 			mir_free(key);

-			debuglog<<time_str()<<": encryption is turned off for "<<(TCHAR*)CallService(MS_CLIST_GETCONTACTDISPLAYNAME, (WPARAM)hContact, GCDNF_TCHAR)<<"\n";

+			debuglog<<std::string(time_str()+": encryption is turned off for "+toUTF8((TCHAR*)CallService(MS_CLIST_GETCONTACTDISPLAYNAME, (WPARAM)hContact, GCDNF_TCHAR)));

 			return false;

 		}

 		mir_free(key);

 	}

-	debuglog<<time_str()<<": encryption is turned on for "<<(TCHAR*)CallService(MS_CLIST_GETCONTACTDISPLAYNAME, (WPARAM)hContact, GCDNF_TCHAR)<<"\n";

+	debuglog<<std::string(time_str()+": encryption is turned on for "+toUTF8((TCHAR*)CallService(MS_CLIST_GETCONTACTDISPLAYNAME, (WPARAM)hContact, GCDNF_TCHAR)));

 	return true;

 }

 

@@ -1181,7 +1181,7 @@ bool isGPGValid()
 			gpg_thread.~thread();

 			TerminateProcess(params.hProcess, 1);

 			params.hProcess = NULL;

-			debuglog<<time_str()<<": GPG execution timed out, aborted\n";

+			debuglog<<std::string(time_str()+": GPG execution timed out, aborted");

 		}

 		gpg_valid = false;

 		string::size_type p1 = out.find("(GnuPG) ");

@@ -1780,7 +1780,7 @@ INT_PTR ImportGpGKeys(WPARAM w, LPARAM l)
 							gpg_thread.~thread();

 							TerminateProcess(params.hProcess, 1);

 							params.hProcess = NULL;

-							debuglog<<time_str()<<": GPG execution timed out, aborted\n";

+							debuglog<<std::string(time_str()+": GPG execution timed out, aborted");

 							break;

 						}

 						if(result == pxNotFound)