[Winpt-commits] r384 - trunk/Src

[scm-commit@wald.intevation.org]

Author: twoaday
Date: 2011-12-13 12:04:49 +0100 (Tue, 13 Dec 2011)
New Revision: 384

Modified:
   trunk/Src/ChangeLog
   trunk/Src/Makefile.am
   trunk/Src/wptKeyManagerDlg.cpp
Log:
2011-12-13  Timo Schulz  <twoaday at gmx.net>

        * Makefile.am: Enable SSP and corrected dependencies.
	* wptKeyManagerDlg.cpp (keymanager_dlg_proc): Redraw
        control after a key was updated from a keyserver.
	


Modified: trunk/Src/ChangeLog
===================================================================
--- trunk/Src/ChangeLog	2011-12-13 10:41:28 UTC (rev 383)
+++ trunk/Src/ChangeLog	2011-12-13 11:04:49 UTC (rev 384)
@@ -1,3 +1,9 @@
+2011-12-13  Timo Schulz  <twoaday at gmx.net>
+
+	* Makefile.am: Enable SSP and corrected dependencies.
+	* wptKeyManagerDlg.cpp (keymanager_dlg_proc): Redraw control after
+	a key was updated from a keyserver.
+
 2011-12-12  Timo Schulz  <twoaday at gmx.net>
 
 	* WinPT-en.rc: Remove winpt.org strings. Thanks to Ralf.

Modified: trunk/Src/Makefile.am
===================================================================
--- trunk/Src/Makefile.am	2011-12-13 10:41:28 UTC (rev 383)
+++ trunk/Src/Makefile.am	2011-12-13 11:04:49 UTC (rev 384)
@@ -17,11 +17,10 @@
 AM_CPPFLAGS = -I$(top_srcdir)/Include \
               -I$(top_srcdir)/Gnupg -I$(top_srcdir)/PTD  \
               -DWIN32 -D_WINDOWS -D_MBCS
-#AM_CFLAGS   = -fstack-protector-all -fexceptions  $(GPGME_CFLAGS)
-#AM_CXXFLAGS = -fstack-protector-all -fexceptions  $(GPGME_CFLAGS)
 
-AM_CFLAGS   = -fexceptions  $(GPGME_CFLAGS)
-AM_CXXFLAGS = -fexceptions  $(GPGME_CFLAGS)
+AM_CFLAGS   = -fstack-protector-all -fexceptions  $(GPGME_CFLAGS)
+AM_CXXFLAGS = -fstack-protector-all -fexceptions  $(GPGME_CFLAGS)
+
 AM_LDFLAGS  = -mwindows
 
 resource_files = \
@@ -125,7 +124,8 @@
               -lgnupg ../PTD/PTD.dll \
 	      $(GPGME_LIBS) $(W32LIBS) \
               -lcomctl32 -lkernel32 -luser32 -lcomdlg32 -ladvapi32 \
-              -lshell32 -lgdi32 -lversion -lole32 -loleaut32 -luuid
+              -lshell32 -lgdi32 -lversion -lole32 -loleaut32 \
+	      -luuid -lssp
 
 WinPTRes.o: $(resource_files)
 

Modified: trunk/Src/wptKeyManagerDlg.cpp
===================================================================
--- trunk/Src/wptKeyManagerDlg.cpp	2011-12-13 10:41:28 UTC (rev 383)
+++ trunk/Src/wptKeyManagerDlg.cpp	2011-12-13 11:04:49 UTC (rev 384)
@@ -1737,6 +1737,9 @@
             return FALSE;
         }
 	
+	// FIXME: after some commands, a redraw of the keylist is required.
+	//  Thus, we need a better way to force a redraw of the control
+	
         switch (LOWORD (wparam)) {
 	    
         case ID_KEYMISC_QUIT:
@@ -1945,8 +1948,7 @@
             
         case ID_KEYMISC_EXPORT:
             if (kmi->lv_idx == -1) {
-                msg_box (dlg, _("Please select a key."),
-			 _("Key Manager"), MB_ERR);
+                msg_box (dlg, _("Please select a key."), _("Key Manager"), MB_ERR);
                 return TRUE;
             }
 	    if (listview_count_items (kmi->lv, 1) > 1)
@@ -2065,11 +2067,11 @@
                         
 	/** Context menu **/
 	case ID_KEYCTX_EDIT:
-	    send_cmd_id( dlg, ID_KEYMISC_EDITKEY );
+	    send_cmd_id (dlg, ID_KEYMISC_EDITKEY);
 	    break;
 
         case ID_KEYCTX_PROPS:
-	    send_cmd_id( dlg, ID_KEYMISC_PROPS );
+	    send_cmd_id (dlg, ID_KEYMISC_PROPS);
 	    break;
 
         case ID_KEYCTX_UIDS: 
@@ -2127,8 +2129,10 @@
 
         case ID_KEYCTX_RECVFROM:
 	    km_refresh_from_keyserver (kmi->kl, dlg);
-	    if (updated_keys_avail ())
+	    if (updated_keys_avail ()) {
 		refresh_keylist (kmi);
+		redraw_keylist (kmi);
+	    }
 	    break;
 
 	case ID_KEYCTX_UID_COPY: