Merge branch 'new_gpg' into new_gpg_autoexchange

Conflicts:
	messages.cpp

1 files changed, 14 insertions, 9 deletions

diff --git a/options.cpp b/options.cpp
index 04cb56b..7eafe97 100644
--- a/options.cpp
+++ b/options.cpp
@@ -100,31 +100,31 @@ static BOOL CALLBACK DlgProcGpgOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARA
   case WM_INITDIALOG:

     {

 		TranslateDialogDefault(hwndDlg);

-		col.pszText = _T("Contact");

+		col.pszText = TranslateW(_T("Contact"));

 		col.mask = LVCF_TEXT | LVCF_WIDTH;

 		col.fmt = LVCFMT_LEFT;

 		col.cx = 60;

 		ListView_InsertColumn(hwndList, 0, &col);

 		ZeroMemory(&col,sizeof(col));

-		col.pszText = _T("Key ID");

+		col.pszText = TranslateW(_T("Key ID"));

 		col.mask = LVCF_TEXT | LVCF_WIDTH;

 		col.fmt = LVCFMT_LEFT;

 		col.cx = 50;

 		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 = 50;

 		ListView_InsertColumn(hwndList, 2, &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 = 50;

 		ListView_InsertColumn(hwndList, 3, &col);

 		ZeroMemory(&col,sizeof(col));

-		col.pszText = _T("Protocol");

+		col.pszText = TranslateW(_T("Protocol"));

 		col.mask = LVCF_TEXT | LVCF_WIDTH;

 		col.fmt = LVCFMT_LEFT;

 		col.cx = 60;

@@ -180,7 +180,7 @@ static BOOL CALLBACK DlgProcGpgOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARA
 		EnableWindow(GetDlgItem(hwndDlg, IDC_JABBER_API), bIsMiranda09);

 		EnableWindow(GetDlgItem(hwndDlg, IDC_AUTO_EXCHANGE), (bIsMiranda09 && bJabberAPI));

 		{

-			string keyinfo = "Current private key id: ";

+			string keyinfo = Translate("Current private key id: ");

 			char *keyid = UniGetContactSettingUtf(NULL, szGPGModuleName, "KeyID", "");

 			keyinfo += (strlen(keyid) > 0)?keyid:"not set";

 			mir_free(keyid);

@@ -257,6 +257,7 @@ static BOOL CALLBACK DlgProcGpgOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARA
 					  {

 						  gpg_thread.~thread();

 						  TerminateProcess(params.hProcess, 1);

+						  params.hProcess = NULL;

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

 						  mir_free(tmp);

 						  break;

@@ -466,6 +467,7 @@ static BOOL CALLBACK DlgProcGpgBinOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LP
 					  {

 						  gpg_thread.~thread();

 						  TerminateProcess(params.hProcess, 1);

+						  params.hProcess = NULL;

 					  }

 					  DBWriteContactSettingTString(NULL, szGPGModuleName, "szGpgBinPath", tmp_path);

 					  mir_free(tmp_path);

@@ -649,7 +651,7 @@ static BOOL CALLBACK DlgProcLoadPublicKey(HWND hwndDlg,UINT msg,WPARAM wParam,LP
 			hcnt = metaGetMostOnline(hcnt);

 		TranslateDialogDefault(hwndDlg);

 		{

-			string msg = "Load Public GPG Key for ";

+			string msg = Translate("Load Public GPG Key for ");

 			msg += (char*)CallService(MS_CLIST_GETCONTACTDISPLAYNAME, (WPARAM)hcnt, 0);

 			SetWindowTextA(hwndDlg, msg.c_str());

 		}

@@ -660,10 +662,10 @@ static BOOL CALLBACK DlgProcLoadPublicKey(HWND hwndDlg,UINT msg,WPARAM wParam,LP
 			EnableWindow(GetDlgItem(hwndDlg, IDC_ENABLE_ENCRYPTION), 0);

 		}

 		if(isContactSecured(hcnt))

-			SetDlgItemText(hwndDlg, IDC_ENABLE_ENCRYPTION, _T("Turn off encryption"));

+			SetDlgItemText(hwndDlg, IDC_ENABLE_ENCRYPTION, TranslateW(_T("Turn off encryption")));

 		else

 		{

-			SetDlgItemText(hwndDlg, IDC_ENABLE_ENCRYPTION, _T("Turn on encryption"));

+			SetDlgItemText(hwndDlg, IDC_ENABLE_ENCRYPTION, TranslateW(_T("Turn on encryption")));

 			CheckDlgButton(hwndDlg, IDC_ENABLE_ENCRYPTION, 1);

 		}

 		if(hcnt)

@@ -712,6 +714,7 @@ static BOOL CALLBACK DlgProcLoadPublicKey(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";

 					}

 					if((out.find("-----BEGIN PGP PUBLIC KEY BLOCK-----") != string::npos) && (out.find("-----END PGP PUBLIC KEY BLOCK-----") != string::npos))

@@ -864,6 +867,7 @@ static BOOL CALLBACK DlgProcLoadPublicKey(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";

 					  break;

 				  }

@@ -1100,6 +1104,7 @@ static BOOL CALLBACK DlgProcLoadPublicKey(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";

 							  break;

 						  }