From 4d9fce6f544f0c6782a7ade4900afd3e1c6c9c52 Mon Sep 17 00:00:00 2001
From: Gluzskiy Alexandr <sss123next@list.ru>
Date: Sat, 29 Jan 2011 15:17:51 +0300
Subject: Better metacontacts handling\nFixed subkey length in keygen

---
 main.cpp | 51 +++++++++++++++++++++++++++------------------------
 1 file changed, 27 insertions(+), 24 deletions(-)

(limited to 'main.cpp')

diff --git a/main.cpp b/main.cpp
index eca2698..9af1f5d 100644
--- a/main.cpp
+++ b/main.cpp
@@ -723,15 +723,15 @@ static BOOL CALLBACK DlgProcGpgBinOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LP
 			  MessageBox(0, _T("please set keyring's home directory"), _T("Warning"), MB_OK);
 			  break;
 		  }
-		  DBWriteContactSettingTString(NULL, szGPGModuleName, "szHomePath", tmp);
-		  {
-			  TCHAR *path = UniGetContactSettingUtf(NULL, szGPGModuleName, "szHomePath", _T(""));
-			  DWORD dwFileAttr = GetFileAttributes(path);
-			  if (dwFileAttr != INVALID_FILE_ATTRIBUTES)
-			  {
-				  dwFileAttr &=~ FILE_ATTRIBUTE_READONLY;
-				  SetFileAttributes(path, dwFileAttr);
-			  }
+		  DBWriteContactSettingTString(NULL, szGPGModuleName, "szHomePath", tmp);
+		  {
+			  TCHAR *path = UniGetContactSettingUtf(NULL, szGPGModuleName, "szHomePath", _T(""));
+			  DWORD dwFileAttr = GetFileAttributes(path);
+			  if (dwFileAttr != INVALID_FILE_ATTRIBUTES)
+			  {
+				  dwFileAttr &=~ FILE_ATTRIBUTE_READONLY;
+				  SetFileAttributes(path, dwFileAttr);
+			  }
 			  mir_free(path);
 		  }
 		  gpg_configured = true;
@@ -806,15 +806,15 @@ static BOOL CALLBACK DlgProcGpgBinOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LP
 			{
 				MessageBox(0, _T("please set keyring's home directory"), _T("Warning"), MB_OK);
 				break;
-			}
-			DBWriteContactSettingTString(NULL, szGPGModuleName, "szHomePath", tmp);
-			{
-				TCHAR *path = UniGetContactSettingUtf(NULL, szGPGModuleName, "szHomePath", _T(""));
-				DWORD dwFileAttr = GetFileAttributes(path);
-				if (dwFileAttr != INVALID_FILE_ATTRIBUTES)
-				{
-					dwFileAttr &=~ FILE_ATTRIBUTE_READONLY;
-					SetFileAttributes(path, dwFileAttr);
+			}
+			DBWriteContactSettingTString(NULL, szGPGModuleName, "szHomePath", tmp);
+			{
+				TCHAR *path = UniGetContactSettingUtf(NULL, szGPGModuleName, "szHomePath", _T(""));
+				DWORD dwFileAttr = GetFileAttributes(path);
+				if (dwFileAttr != INVALID_FILE_ATTRIBUTES)
+				{
+					dwFileAttr &=~ FILE_ATTRIBUTE_READONLY;
+					SetFileAttributes(path, dwFileAttr);
 				}
 				mir_free(path);
 			}
@@ -1144,6 +1144,9 @@ static BOOL CALLBACK DlgProcKeyGenDialog(HWND hwndDlg, UINT msg, WPARAM wParam,
 				  delete [] tmp;
 				  f<<length;
 				  f<<"\n";
+				  f<<"Subkey-Length: ";
+				  f<<length;
+				  f<<"\n";
 				  f<<"Subkey-Type: ";
 				  f<<subkeytype;
 				  delete [] subkeytype;
@@ -1730,12 +1733,12 @@ void InitCheck()
 			if(MessageBoxA(0, question.c_str(), "Own secret key warning", MB_YESNO) == IDYES)
 				ShowFirstRunDialog();
 	}
-	{
-		TCHAR *path = UniGetContactSettingUtf(NULL, szGPGModuleName, "szHomePath", _T(""));
-		DWORD dwFileAttr = GetFileAttributes(path);
-		if (dwFileAttr != INVALID_FILE_ATTRIBUTES)
-		{
-			dwFileAttr &=~ FILE_ATTRIBUTE_READONLY;
+	{
+		TCHAR *path = UniGetContactSettingUtf(NULL, szGPGModuleName, "szHomePath", _T(""));
+		DWORD dwFileAttr = GetFileAttributes(path);
+		if (dwFileAttr != INVALID_FILE_ATTRIBUTES)
+		{
+			dwFileAttr &=~ FILE_ATTRIBUTE_READONLY;
 			SetFileAttributes(path, dwFileAttr);
 		}
 		mir_free(path);
-- 
cgit v1.2.3