modified: gpg_wrapper.cpp

	modified:   log.cpp
	modified:   log.h
	modified:   main.cpp
	modified:   new_gpg.rc
	modified:   options.cpp
	modified:   resource.h

1 files changed, 7 insertions, 0 deletions

diff --git a/options.cpp b/options.cpp
index ee84efe..b361113 100644
--- a/options.cpp
+++ b/options.cpp
@@ -386,6 +386,8 @@ static BOOL CALLBACK DlgProcGpgOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARA
         {
 			extern bool bDebugLog, bJabberAPI;
 			bDebugLog = CheckStateStoreDB(hwndDlg, IDC_DEBUG_LOG, "bDebugLog");
+			if(bDebugLog)
+				debuglog.init();
 			bJabberAPI = CheckStateStoreDB(hwndDlg, IDC_JABBER_API, "bJabberAPI");
 			{
 				TCHAR tmp[512];
@@ -683,6 +685,7 @@ static BOOL CALLBACK DlgProcLoadPublicKey(HWND hwndDlg,UINT msg,WPARAM wParam,LP
 						msg += tmp;
 						msg += " found in prescense.)";
 						SetWindowTextA(hwndDlg, msg.c_str());
+						EnableWindow(GetDlgItem(hwndDlg, IDC_IMPORT), 1);
 					}
 				}
 				mir_free(tmp2);
@@ -1157,6 +1160,10 @@ static BOOL CALLBACK DlgProcLoadPublicKey(HWND hwndDlg,UINT msg,WPARAM wParam,LP
 			  key_buf.clear();
 		  }
 		  break;
+	  case IDC_IMPORT:
+		  void ShowImportKeyDialog();
+		  ShowImportKeyDialog();
+		  break;
 	  case IDC_SELECT_EXISTING:
 		  void ShowSelectExistingKeyDialog();
 		  ShowSelectExistingKeyDialog();