[Winpt-commits] r120 - trunk/Src

[scm-commit at wald.intevation.org]

Author: twoaday
Date: 2005-12-09 15:27:59 +0100 (Fri, 09 Dec 2005)
New Revision: 120

Modified:
   trunk/Src/ChangeLog
   trunk/Src/wptAboutDlgs.cpp
   trunk/Src/wptClipEditDlg.cpp
   trunk/Src/wptKeyManagerDlg.cpp
Log:
See ChangeLog.



Modified: trunk/Src/ChangeLog
===================================================================
--- trunk/Src/ChangeLog	2005-12-09 08:04:51 UTC (rev 119)
+++ trunk/Src/ChangeLog	2005-12-09 14:27:59 UTC (rev 120)
@@ -13,6 +13,8 @@
 	keylist after inserting items.
 	* wptFileManager.cpp (fm_set_status): Take care of
 	cleartext sigs.
+	* wptKeyManagerDlg.cpp (keymanager_dlg_proc): Make
+	sure can be closed.
 	
 2005-12-07  Timo Schulz  <ts at g10code.com>
 

Modified: trunk/Src/wptAboutDlgs.cpp
===================================================================
--- trunk/Src/wptAboutDlgs.cpp	2005-12-09 08:04:51 UTC (rev 119)
+++ trunk/Src/wptAboutDlgs.cpp	2005-12-09 14:27:59 UTC (rev 120)
@@ -34,7 +34,7 @@
 #ifdef _MSC_VER
 #include "winpt_header.h"
 
-static DWORD about_help_arr[] = {
+static DWORD help_arr[] = {
     IDC_ABOUT_HELP, WPT_ABOUT_HELP,
     IDC_ABOUT_GPG, WPT_ABOUT_GPG,
     IDOK, WPT_ABOUT_OK,
@@ -123,7 +123,7 @@
 	break;
 
     case WM_HELP:
-	html_help_dispatch (lparam, "winpt.chm::winpt_texts.txt", about_help_arr);
+	html_help_dispatch (lparam, "winpt.chm::winpt_texts.txt", help_arr);
 	break;
 
     case WM_SYSCOMMAND:

Modified: trunk/Src/wptClipEditDlg.cpp
===================================================================
--- trunk/Src/wptClipEditDlg.cpp	2005-12-09 08:04:51 UTC (rev 119)
+++ trunk/Src/wptClipEditDlg.cpp	2005-12-09 14:27:59 UTC (rev 120)
@@ -32,6 +32,18 @@
 #include "wptNLS.h"
 #include "resource.h"
 
+#ifdef _MSC_VER
+#include "winpt_header.h"
+                                                                                
+static DWORD help_arr[] = {
+        IDC_CLIPEDIT_SEND,  WPT_CLIPEDIT_COPY,
+	IDC_CLIPEDIT_CLEAR, WPT_CLIPEDIT_CLEAR,
+	IDC_CLIPEDIT_LOAD,  WPT_CLIPEDIT_LOAD,
+	IDC_CLIPEDIT_SAVE,  WPT_CLIPEDIT_SAVE,
+	IDC_CLIPEDIT_QUOTE, WPT_CLIPEDIT_QUOTE,
+	0, 0
+};
+#endif
 
 /* Load the clipboard contents into the text field in @dlg.
    Return value: 0 on success. */

Modified: trunk/Src/wptKeyManagerDlg.cpp
===================================================================
--- trunk/Src/wptKeyManagerDlg.cpp	2005-12-09 08:04:51 UTC (rev 119)
+++ trunk/Src/wptKeyManagerDlg.cpp	2005-12-09 14:27:59 UTC (rev 120)
@@ -1046,7 +1046,7 @@
 	return FALSE;
 
     case WM_COMMAND:
-        if( gnupg_access_keyring( 1 ) ) {
+        if (gnupg_access_keyring (1) && LOWORD (wparam) != ID_KEYMISC_QUIT) {
             msg_box( dlg, _("Could not access public keyring"), _("Key Manager"), MB_ERR );
             return FALSE;
         }