gnome-keyring r1639 - in trunk: . daemon/keyrings

[nnielsen svn gnome org]

Author: nnielsen
Date: Sat Feb 28 22:46:25 2009
New Revision: 1639
URL: http://svn.gnome.org/viewvc/gnome-keyring?rev=1639&view=rev

Log:
Load keyrings if they've never been loaded when looking for a keyring.

Modified:
   trunk/ChangeLog
   trunk/daemon/keyrings/gkr-keyrings.c

Modified: trunk/daemon/keyrings/gkr-keyrings.c
==============================================================================
--- trunk/daemon/keyrings/gkr-keyrings.c	(original)
+++ trunk/daemon/keyrings/gkr-keyrings.c	Sat Feb 28 22:46:25 2009
@@ -47,6 +47,7 @@
 #define LOC_DEFAULT_FILE    (gkr_location_from_string ("LOCAL:/keyrings/default"))
 
 static gboolean keyrings_inited = FALSE;
+static gboolean keyrings_loaded = FALSE;
 
 static GList *keyrings = NULL;
 
@@ -274,9 +275,9 @@
 	keyrings_init ();
 	gkr_location_watch_refresh (location_watch, FALSE);
 	update_default ();
+	keyrings_loaded = TRUE;
 }
 
-
 void 
 gkr_keyrings_add (GkrKeyring *keyring)
 {
@@ -335,6 +336,9 @@
 	GList *l;
 	
 	keyrings_init ();
+	
+	if (!keyrings_loaded)
+		gkr_keyrings_update ();
 
 	if (name == NULL)
 		return gkr_keyrings_get_default ();