Merge branch 'new_gpg' into new_gpg_autoexchange

Conflicts:
	messages.cpp

1 files changed, 33 insertions, 13 deletions

diff --git a/main.cpp b/main.cpp
index 415a689..909902c 100644
--- a/main.cpp
+++ b/main.cpp
@@ -41,31 +41,32 @@ static BOOL CALLBACK DlgProcFirstRun(HWND hwndDlg,UINT msg,WPARAM wParam,LPARAM
     {
 		SetWindowPos(hwndDlg, 0, firstrun_rect.left, firstrun_rect.top, 0, 0, SWP_NOSIZE|SWP_SHOWWINDOW);
 		TranslateDialogDefault(hwndDlg);
+		SetWindowText(hwndDlg, TranslateW(_T("Set own key")));
 		col.pszText = _T("Key ID");
 		col.mask = LVCF_TEXT | LVCF_WIDTH;
 		col.fmt = LVCFMT_LEFT;
 		col.cx = 50;
 		ListView_InsertColumn(hwndList, 0, &col);
 		ZeroMemory(&col,sizeof(col));
-		col.pszText = _T("Email");
+		col.pszText = TranslateW(_T("Email"));
 		col.mask = LVCF_TEXT | LVCF_WIDTH;
 		col.fmt = LVCFMT_LEFT;
 		col.cx = 30;
 		ListView_InsertColumn(hwndList, 1, &col);
 		ZeroMemory(&col,sizeof(col));
-		col.pszText = _T("Name");
+		col.pszText = TranslateW(_T("Name"));
 		col.mask = LVCF_TEXT | LVCF_WIDTH;
 		col.fmt = LVCFMT_LEFT;
 		col.cx = 250;
 		ListView_InsertColumn(hwndList, 2, &col);
 		ZeroMemory(&col,sizeof(col));
-		col.pszText = _T("Creation date");
+		col.pszText = TranslateW(_T("Creation date"));
 		col.mask = LVCF_TEXT | LVCF_WIDTH;
 		col.fmt = LVCFMT_LEFT;
 		col.cx = 30;
 		ListView_InsertColumn(hwndList, 3, &col);
 		ZeroMemory(&col,sizeof(col));
-		col.pszText = _T("Key length");
+		col.pszText = TranslateW(_T("Key length"));
 		col.mask = LVCF_TEXT | LVCF_WIDTH;
 		col.fmt = LVCFMT_LEFT;
 		col.cx = 30;
@@ -95,6 +96,7 @@ static BOOL CALLBACK DlgProcFirstRun(HWND hwndDlg,UINT msg,WPARAM wParam,LPARAM
 					{
 						gpg_thread.~thread();
 						TerminateProcess(params.hProcess, 1);
+						params.hProcess = NULL;
 						debuglog<<time_str()<<": GPG execution timed out, aborted\n";
 						break;
 					}
@@ -189,6 +191,7 @@ static BOOL CALLBACK DlgProcFirstRun(HWND hwndDlg,UINT msg,WPARAM wParam,LPARAM
 			  {
 				  gpg_thread.~thread();
 				  TerminateProcess(params.hProcess, 1);
+				  params.hProcess = NULL;
 				  debuglog<<time_str()<<": GPG execution timed out, aborted\n";
 				  break;
 			  }
@@ -258,6 +261,7 @@ static BOOL CALLBACK DlgProcFirstRun(HWND hwndDlg,UINT msg,WPARAM wParam,LPARAM
 						  {
 							  gpg_thread.~thread();
 							  TerminateProcess(params.hProcess, 1);
+							  params.hProcess = NULL;
 							  debuglog<<time_str()<<": GPG execution timed out, aborted\n";
 							  break;
 						  }
@@ -330,6 +334,7 @@ static BOOL CALLBACK DlgProcFirstRun(HWND hwndDlg,UINT msg,WPARAM wParam,LPARAM
 			  {
 				  delete gpg_thread;
 				  TerminateProcess(params.hProcess, 1);
+				  params.hProcess = NULL;
 				  debuglog<<time_str()<<": GPG execution timed out, aborted\n";
 				  break;
 			  }
@@ -358,6 +363,7 @@ static BOOL CALLBACK DlgProcFirstRun(HWND hwndDlg,UINT msg,WPARAM wParam,LPARAM
 			  {
 				  delete gpg_thread;
 				  TerminateProcess(params.hProcess, 1);
+				  params.hProcess = NULL;
 				  debuglog<<time_str()<<": GPG execution timed out, aborted\n";
 				  break;
 			  }
@@ -423,6 +429,7 @@ static BOOL CALLBACK DlgProcFirstRun(HWND hwndDlg,UINT msg,WPARAM wParam,LPARAM
 				  {
 					  gpg_thread.~thread();
 					  TerminateProcess(params.hProcess, 1);
+					  params.hProcess = NULL;
 					  debuglog<<time_str()<<": GPG execution timed out, aborted";
 					  break;
 				  }
@@ -454,6 +461,7 @@ static BOOL CALLBACK DlgProcFirstRun(HWND hwndDlg,UINT msg,WPARAM wParam,LPARAM
 				  {
 					  gpg_thread.~thread();
 					  TerminateProcess(params.hProcess, 1);
+					  params.hProcess = NULL;
 					  debuglog<<time_str()<<"GPG execution timed out, aborted\n";
 					  break;
 				  }
@@ -591,6 +599,7 @@ static BOOL CALLBACK DlgProcGpgBinOpts(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";
 			}
 			gpg_configured = false;
@@ -710,6 +719,7 @@ static BOOL CALLBACK DlgProcGpgBinOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LP
 			  if(!gpg_thread.timed_join(boost::posix_time::seconds(10)))
 			  {
 				  TerminateProcess(params.hProcess, 1);
+				  params.hProcess = NULL;
 				  gpg_thread.~thread();
 				  debuglog<<time_str()<<": GPG execution timed out, aborted\n";
 			  }
@@ -798,6 +808,7 @@ static BOOL CALLBACK DlgProcGpgBinOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LP
 				if(!gpg_thread.timed_join(boost::posix_time::seconds(10)))
 				{
 					TerminateProcess(params.hProcess, 1);
+					params.hProcess = NULL;
 					gpg_thread.~thread();
 					debuglog<<time_str()<<": GPG execution timed out, aborted\n";
 				}
@@ -890,6 +901,7 @@ static BOOL CALLBACK DlgProcGpgBinOpts(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";
 					  gpg_configured = false;
 					  break;
@@ -923,6 +935,7 @@ static BOOL CALLBACK DlgProcGpgBinOpts(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";
 					  gpg_configured = false;
 					  break;
@@ -1060,6 +1073,7 @@ static BOOL CALLBACK DlgProcKeyGenDialog(HWND hwndDlg, UINT msg, WPARAM wParam,
     {
 		SetWindowPos(hwndDlg, 0, key_gen_rect.left, key_gen_rect.top, 0, 0, SWP_NOSIZE|SWP_SHOWWINDOW);
 		TranslateDialogDefault(hwndDlg);
+		SetWindowText(hwndDlg, TranslateW(_T("Key Generation dialog")));
 		ComboBoxAddStringUtf(GetDlgItem(hwndDlg, IDC_KEY_TYPE), _T("RSA"), 0);
 		ComboBoxAddStringUtf(GetDlgItem(hwndDlg, IDC_KEY_TYPE), _T("DSA"), 1);
 		SendDlgItemMessage(hwndDlg, IDC_KEY_TYPE, CB_SETCURSEL, (WPARAM)1, 0);
@@ -1085,7 +1099,7 @@ static BOOL CALLBACK DlgProcKeyGenDialog(HWND hwndDlg, UINT msg, WPARAM wParam,
 				  if(_tcslen(tmp) < 3)
 				  {
 					  mir_free(tmp);
-					  MessageBox(0, _T("You must set encryption algorythm first"), _T("Error"), MB_OK);
+					  MessageBox(0, TranslateW(_T("You must set encryption algorythm first")), TranslateW(_T("Error")), MB_OK);
 					  break;
 				  }
 				  mir_free(tmp);
@@ -1095,14 +1109,14 @@ static BOOL CALLBACK DlgProcKeyGenDialog(HWND hwndDlg, UINT msg, WPARAM wParam,
 				  mir_free(tmp);
 				  if(length < 1024 || length > 4096)
 				  {
-					  MessageBox(0, _T("Key length must be of length from 1024 to 4096 bits"), _T("Error"), MB_OK);
+					  MessageBox(0, TranslateW(_T("Key length must be of length from 1024 to 4096 bits")), TranslateW(_T("Error")), MB_OK);
 					  break;
 				  }
 				  tmp = new TCHAR [12];
 				  GetDlgItemText(hwndDlg, IDC_KEY_EXPIRE_DATE, tmp, 12);
 				  if(_tcslen(tmp) != 10 && tmp[0] != '0')
 				  {
-					  MessageBox(0, _T("Invalid date"), _T("Error"), MB_OK);
+					  MessageBox(0, TranslateW(_T("Invalid date")), TranslateW(_T("Error")), MB_OK);
 					  delete [] tmp;
 					  break;
 				  }
@@ -1111,13 +1125,13 @@ static BOOL CALLBACK DlgProcKeyGenDialog(HWND hwndDlg, UINT msg, WPARAM wParam,
 				  GetDlgItemText(hwndDlg, IDC_KEY_REAL_NAME, tmp, 128);
 				  if(_tcslen(tmp) < 5)
 				  {
-					  MessageBox(0, _T("Name must contain at least 5 characters"), _T("Error"), MB_OK);
+					  MessageBox(0, TranslateW(_T("Name must contain at least 5 characters")), TranslateW(_T("Error")), MB_OK);
 					  delete [] tmp;
 					  break;
 				  }
 				  else if (_tcschr(tmp, _T('(')) || _tcschr(tmp, _T(')')))
 				  {
-					  MessageBox(0, _T("Name cannot contain '(' or ')'"), _T("Error"), MB_OK);
+					  MessageBox(0, TranslateW(_T("Name cannot contain '(' or ')'")), TranslateW(_T("Error")), MB_OK);
 					  delete [] tmp;
 					  break;
 				  }
@@ -1126,7 +1140,7 @@ static BOOL CALLBACK DlgProcKeyGenDialog(HWND hwndDlg, UINT msg, WPARAM wParam,
 				  GetDlgItemText(hwndDlg, IDC_KEY_EMAIL, tmp, 128);
 				  if((_tcslen(tmp)) < 5 || (!_tcschr(tmp, _T('@'))) || (!_tcschr(tmp, _T('.'))))
 				  {
-					  MessageBox(0, _T("Invalid Email"), _T("Error"), MB_OK);
+					  MessageBox(0, TranslateW(_T("Invalid Email")), TranslateW(_T("Error")), MB_OK);
 					  delete [] tmp;
 					  break;
 				  }
@@ -1142,7 +1156,7 @@ static BOOL CALLBACK DlgProcKeyGenDialog(HWND hwndDlg, UINT msg, WPARAM wParam,
 				  wfstream f(path.c_str(), std::ios::out);
 				  if(!f.is_open())
 				  {
-					  MessageBox(0, _T("Failed to open file"), _T("Error"), MB_OK);
+					  MessageBox(0, TranslateW(_T("Failed to open file")), TranslateW(_T("Error")), MB_OK);
 					  break;
 				  }
 				  f<<"Key-Type: ";
@@ -1239,7 +1253,7 @@ static BOOL CALLBACK DlgProcKeyGenDialog(HWND hwndDlg, UINT msg, WPARAM wParam,
 				  {
 					  gpg_thread.~thread();
 					  TerminateProcess(params.hProcess, 1);
-					  MessageBox(0, _T("GPG execution timed out, aborted"), _T(""), MB_OK);
+					  params.hProcess = NULL;
 					  debuglog<<time_str()<<": GPG execution timed out, aborted\n";
 					  break;
 				  }
@@ -1272,6 +1286,7 @@ static BOOL CALLBACK DlgProcKeyGenDialog(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";
 						break;
 					}
@@ -1433,6 +1448,7 @@ static BOOL CALLBACK DlgProcLoadExistingKey(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";
 						break;
 					}
@@ -1541,6 +1557,7 @@ static BOOL CALLBACK DlgProcLoadExistingKey(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";
 				  break;
 			  }
@@ -1651,6 +1668,7 @@ static BOOL CALLBACK DlgProcImportKeyDialog(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";
 			  }
 			  MessageBoxA(0, out.c_str(), "GPG output", MB_OK);
@@ -1772,6 +1790,7 @@ void InitCheck()
 			{
 				gpg_thread.~thread();
 				TerminateProcess(params.hProcess, 1);
+				params.hProcess = NULL;
 				debuglog<<time_str()<<": GPG execution timed out, aborted\n";
 				return;
 			}
@@ -1884,6 +1903,7 @@ void ImportKey()
 		{
 			gpg_thread.~thread();
 			TerminateProcess(params.hProcess, 1);
+			params.hProcess = NULL;
 			debuglog<<time_str()<<": GPG execution timed out, aborted\n";
 			return;
 		}
@@ -1977,7 +1997,7 @@ void ImportKey()
 					tmp = new char [output.substr(s,s2-s-1).length()+1];
 					strcpy(tmp, output.substr(s,s2-s-1).c_str());
 					mir_utf8decode(tmp, 0);
-					DBWriteContactSettingString(metaGetContact(hContact), szGPGModuleName, "KeyMainName", tmp);
+					DBWriteContactSettingString(metaGetMostOnline(hContact), szGPGModuleName, "KeyMainName", tmp);
 					mir_free(tmp);
 					if((s = output.find(")", s2)) == string::npos)
 						s = output.find(">", s2);