seahorse r2493 - in trunk: . pgp

[nnielsen svn gnome org]

Author: nnielsen
Date: Sat Sep 13 15:28:37 2008
New Revision: 2493
URL: http://svn.gnome.org/viewvc/seahorse?rev=2493&view=rev

Log:
	* pgp/seahorse-pgp-key-properties.c: Show revoked subkeys
	properly in details view of PGP keys. Fixes bug #550913

Modified:
   trunk/ChangeLog
   trunk/pgp/seahorse-pgp-key-properties.c

Modified: trunk/pgp/seahorse-pgp-key-properties.c
==============================================================================
--- trunk/pgp/seahorse-pgp-key-properties.c	(original)
+++ trunk/pgp/seahorse-pgp-key-properties.c	Sat Sep 13 15:28:37 2008
@@ -1379,8 +1379,12 @@
 
         subkey = seahorse_pgp_key_get_nth_subkey (pkey, key);
 
-        status = subkey->revoked ? _("Revoked") : _("Good");
-        status = subkey->expired ? _("Expired") : _("Good");
+        if (subkey->revoked)
+        	status = _("Revoked");
+        else if (subkey->expired)
+        	status = _("Expired");
+        else
+        	status = _("Good");
 
         if (subkey->expires == 0)
             expiration_date = g_strdup (C_("Expires", "Never"));