From 77664979ae7f2e534e31f66aa9286d874d9da2bc Mon Sep 17 00:00:00 2001
From: Gluzskiy Alexandr <sss123next@list.ru>
Date: Fri, 1 Apr 2011 10:14:07 +0300
Subject: 	modified:   gpg_wrapper.cpp 	modified:   gpg_wrapper.h 
 modified:   main.cpp 	modified:   messages.cpp 	modified:  
 options.cpp 	modified:   utilities.cpp

---
 options.cpp | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'options.cpp')

diff --git a/options.cpp b/options.cpp
index 04cb56b..c9b9de7 100644
--- a/options.cpp
+++ b/options.cpp
@@ -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);
@@ -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;
 						  }
-- 
cgit v1.2.3


From eacaecb90d386044d24f47606007a0d348e92ebb Mon Sep 17 00:00:00 2001
From: Gluzskiy Alexandr <sss123next@list.ru>
Date: Sat, 9 Apr 2011 21:53:35 +0300
Subject: Improved translation ability requested on forums

---
 options.cpp | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'options.cpp')

diff --git a/options.cpp b/options.cpp
index c9b9de7..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);
@@ -651,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());
 		}
@@ -662,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)
-- 
cgit v1.2.3