seahorse r2863 - in trunk: . libseahorse pgp

[nnielsen svn gnome org]

Author: nnielsen
Date: Sat Feb 28 19:12:34 2009
New Revision: 2863
URL: http://svn.gnome.org/viewvc/seahorse?rev=2863&view=rev

Log:
Always have an ID on a GPGME key before trying to load other parts.

Modified:
   trunk/ChangeLog
   trunk/libseahorse/seahorse-object.c
   trunk/pgp/seahorse-gpgme-key.c

Modified: trunk/libseahorse/seahorse-object.c
==============================================================================
--- trunk/libseahorse/seahorse-object.c	(original)
+++ trunk/libseahorse/seahorse-object.c	Sat Feb 28 19:12:34 2009
@@ -619,8 +619,6 @@
 seahorse_object_get_id (SeahorseObject *self)
 {
 	g_return_val_if_fail (SEAHORSE_IS_OBJECT (self), 0);
-	if (!self->pv->id)
-		seahorse_object_realize (self);
 	return self->pv->id;
 }
 

Modified: trunk/pgp/seahorse-gpgme-key.c
==============================================================================
--- trunk/pgp/seahorse-gpgme-key.c	(original)
+++ trunk/pgp/seahorse-gpgme-key.c	Sat Feb 28 19:12:34 2009
@@ -578,10 +578,12 @@
 
 SeahorseGpgmeKey* 
 seahorse_gpgme_key_new (SeahorseSource *sksrc, gpgme_key_t pubkey, 
-                      gpgme_key_t seckey)
+                        gpgme_key_t seckey)
 {
 	return g_object_new (SEAHORSE_TYPE_GPGME_KEY, "source", sksrc,
-	                     "pubkey", pubkey, "seckey", seckey, NULL);
+	                     "id", seahorse_pgp_key_canonize_id (pubkey->subkeys->keyid),
+	                     "pubkey", pubkey, "seckey", seckey, 
+	                     NULL);
 }
 
 gpgme_key_t