[Gpa-commits] r909 - trunk/src

[scm-commit@wald.intevation.org]

Author: moritzs
Date: 2008-10-04 15:24:23 +0200 (Sat, 04 Oct 2008)
New Revision: 909

Modified:
   trunk/src/ChangeLog
   trunk/src/gpgmetools.c
   trunk/src/siglist.c
Log:
2008-09-19  Moritz  <moritz at gnu.org>

	* siglist.c (gpa_siglist_set_userid): Call gtk_list_store_clear
	before revoked_signatures is called; simply return in case uid is
	NULL.



Modified: trunk/src/ChangeLog
===================================================================
--- trunk/src/ChangeLog	2008-09-16 00:01:21 UTC (rev 908)
+++ trunk/src/ChangeLog	2008-10-04 13:24:23 UTC (rev 909)
@@ -1,3 +1,9 @@
+2008-09-19  Moritz  <moritz at gnu.org>
+
+	* siglist.c (gpa_siglist_set_userid): Call gtk_list_store_clear
+	before revoked_signatures is called; simply return in case uid is
+	NULL.
+
 2008-07-15  Marcus Brinkmann  <marcus at g10code.de>
 
 	* server.c: Include "gpafileop.h", "gpafileencryptop.h",

Modified: trunk/src/gpgmetools.c
===================================================================
--- trunk/src/gpgmetools.c	2008-09-16 00:01:21 UTC (rev 908)
+++ trunk/src/gpgmetools.c	2008-10-04 13:24:23 UTC (rev 909)
@@ -830,6 +830,10 @@
   /* Tag revoked UID's*/
   if (uid->revoked)
     {
+      /* FIXME: I think, this code should be simply disabled. Even if
+	 the uid U is revoked, it is "U", not "[Revoked] U". Side
+	 note: adding this prefix obviously breaks sorting by
+	 uid. -moritz */
       gchar *tmp = g_strdup_printf ("[%s] %s", _("Revoked"), uid_utf8);
       g_free (uid_utf8);
       uid_utf8 = tmp;

Modified: trunk/src/siglist.c
===================================================================
--- trunk/src/siglist.c	2008-09-16 00:01:21 UTC (rev 908)
+++ trunk/src/siglist.c	2008-10-04 13:24:23 UTC (rev 909)
@@ -256,11 +256,16 @@
   gpa_siglist_clear_columns (list);
   gpa_siglist_uid_add_columns (list);
 
+  /* Clear the model */
+  gtk_list_store_clear (store);
+
+  if (!uid)
+    /* No user ID -> no signatures, do nothing here. */
+    return;
+
   /* Get the list of revoked signatures */
   revoked = revoked_signatures (key, uid);
 
-  /* Clear the model */
-  gtk_list_store_clear (store);
   /* Add the signatures to the model */
   for (sig = uid->signatures; sig; sig = sig->next)
     {
@@ -310,7 +315,7 @@
 	  for (i = 0, uid = key->uids; i < idx; i++, uid = uid->next)
 	    {
 	    }
-          gpa_siglist_set_userid (list, key, uid);
+	  gpa_siglist_set_userid (list, key, uid);
 	  g_object_set_data (G_OBJECT (list), "all_signatures", 
 			     GINT_TO_POINTER (FALSE));
         }