[Gpa-commits] r997 - in trunk: . src

[scm-commit@wald.intevation.org]

Author: werner
Date: 2009-05-20 09:41:03 +0200 (Wed, 20 May 2009)
New Revision: 997

Modified:
   trunk/TODO
   trunk/src/ChangeLog
   trunk/src/cm-openpgp.c
Log:
Fix the force-sig flag.


Modified: trunk/TODO
===================================================================
--- trunk/TODO	2009-05-16 12:55:07 UTC (rev 996)
+++ trunk/TODO	2009-05-20 07:41:03 UTC (rev 997)
@@ -8,18 +8,15 @@
    than a second (idea: simply disable refresh button?)
 ** display messages "please attach reader" in case no smartcard reader is attached
 ** mark readonly data objects on the card (maybe grey them out?)
-** buttons for modifying writable data objects that open a modal dialog plus
-   automatic refresh after write.
 ** generate-new-key-pair button if card contains no key.
 ** check if cardman releases the smartcard (reader) as it should. maybe we have
    to destroy the cardman instance instead of simply hiding it.
-** button for automatic retrival of key through url field?
+** button for automatic retrieval of key through url field?
 
 * Redo the key generation wizard stuff, as it is one ugly hack on top of
   another at this point.
 ** It should also print a progress indicator as the expert mode does.
 
-
 * Dialogs should check user input and react to it.
 ** Don't allow the user to go on unless the input makes sense (particularly
    for the advanced key generation dialog and the import dialog).
@@ -92,14 +89,9 @@
    - Or print a hint in the status bar the first time something is
      selected.  Such hints helped me a lot to get acquainted with JOSM [wk].
 
-** The keyring editor has a pop up if there is no default key that says
-   that the user has no private key.  But the user can have a private key.
-   Either fix the message or the check.
 ** The keyserver setting should remember the strings entered by the user.
 ** In the expiration widget, the expire after and the calender widgets should
    be synchronized.
-** Confirm generation of key pair by popping up a dialog, or convert
-   the progress meter to a dialog that needs to be OK'ed.
 ** When doing signing etc operations, gpa keylist should filter out expired
    and otherwise unusable keys.  When an operation fails (due to bad
    key, for example), GPA creates a signature of zero bytes and shows
@@ -150,9 +142,6 @@
    fingerprint). I think the expander's width should be allowed to
    grow in case there's unused space to the right of the expander widget.
 
-** Rework the About dialog
-  For example, there is no version number.
-
 * Building
 
 * Bugs

Modified: trunk/src/ChangeLog
===================================================================
--- trunk/src/ChangeLog	2009-05-16 12:55:07 UTC (rev 996)
+++ trunk/src/ChangeLog	2009-05-20 07:41:03 UTC (rev 997)
@@ -1,3 +1,8 @@
+2009-05-19  Werner Koch  <wk at g10code.com>
+
+	* cm-openpgp.c (update_entry_chv_status): Reverse force_pw1 setting.
+	(save_entry_sig_force_pin): Ditto.
+
 2009-05-16  Moritz  <moritz at gnu.org>
 
 	* cardman.c (gpa_card_manager_finalize): Check for

Modified: trunk/src/cm-openpgp.c
===================================================================
--- trunk/src/cm-openpgp.c	2009-05-16 12:55:07 UTC (rev 996)
+++ trunk/src/cm-openpgp.c	2009-05-20 07:41:03 UTC (rev 997)
@@ -354,7 +354,7 @@
 
   while (spacep (string))
     string++;
-  force_pw1 = atoi (string);
+  force_pw1 = !atoi (string);
   while (*string && !spacep (string))
     string++;
   while (spacep (string))
@@ -866,7 +866,7 @@
   value = gtk_toggle_button_get_active 
     (GTK_TOGGLE_BUTTON (card->entries[ENTRY_SIG_FORCE_PIN]));
 
-  if (save_attr (card, "CHV-STATUS-1", value? "%01":"%00", 1))
+  if (save_attr (card, "CHV-STATUS-1", value? "%00":"%01", 1))
     errstr = _("Saving the field failed.");
 
   if (errstr)