seahorse r2396 - in trunk: . src

[sadam svn gnome org]

Author: sadam
Date: Wed Aug 27 14:52:51 2008
New Revision: 2396
URL: http://svn.gnome.org/viewvc/seahorse?rev=2396&view=rev

Log:
2008-08-27  Adam Schreiber  <sadam clemson edu>

    * src/vala-build.stamp:
    * src/seahorse-key-manager.c:
    * src/seahorse-key-manager.vala: Don't repetedly load gnome-keyring 
items.
    Fixes bug #547682


Modified:
   trunk/ChangeLog
   trunk/src/seahorse-key-manager.c
   trunk/src/seahorse-key-manager.vala
   trunk/src/vala-build.stamp

Modified: trunk/src/seahorse-key-manager.c
==============================================================================
--- trunk/src/seahorse-key-manager.c	(original)
+++ trunk/src/seahorse-key-manager.c	Wed Aug 27 14:52:51 2008
@@ -135,6 +135,8 @@
 static void seahorse_key_manager_on_gconf_notify (SeahorseKeyManager* self, GConfClient* client, guint cnxn_id, GConfEntry* entry);
 static gboolean seahorse_key_manager_fire_selection_changed (SeahorseKeyManager* self);
 static void seahorse_key_manager_on_tab_changed (SeahorseKeyManager* self, GtkNotebook* notebook, void* unused, guint page_num);
+static void __lambda0 (SeahorseOperation* op, SeahorseKeyManager* self);
+static void ___lambda0_seahorse_done_func (SeahorseOperation* op, gpointer self);
 static void seahorse_key_manager_load_gnome_keyring_items (SeahorseKeyManager* self);
 static void seahorse_key_manager_on_help_show (SeahorseKeyManager* self, GtkButton* button);
 static void _seahorse_key_manager_on_app_quit_gtk_action_activate (GtkAction* _sender, gpointer self);
@@ -974,6 +976,19 @@
 }
 
 
+static void __lambda0 (SeahorseOperation* op, SeahorseKeyManager* self) {
+	g_return_if_fail (SEAHORSE_IS_OPERATION (op));
+	if (seahorse_operation_is_successful (op)) {
+		self->priv->_loaded_gnome_keyring = TRUE;
+	}
+}
+
+
+static void ___lambda0_seahorse_done_func (SeahorseOperation* op, gpointer self) {
+	__lambda0 (op, self);
+}
+
+
 static void seahorse_key_manager_load_gnome_keyring_items (SeahorseKeyManager* self) {
 	GType type;
 	SeahorseSource* sksrc;
@@ -989,6 +1004,7 @@
 	op = seahorse_source_load (sksrc, ((GQuark) (0)));
 	/* Monitor loading progress */
 	seahorse_progress_status_set_operation (SEAHORSE_WIDGET (self), op);
+	seahorse_operation_watch (op, ___lambda0_seahorse_done_func, self, NULL, NULL);
 	(sksrc == NULL ? NULL : (sksrc = (g_object_unref (sksrc), NULL)));
 	(op == NULL ? NULL : (op = (g_object_unref (op), NULL)));
 }

Modified: trunk/src/seahorse-key-manager.vala
==============================================================================
--- trunk/src/seahorse-key-manager.vala	(original)
+++ trunk/src/seahorse-key-manager.vala	Wed Aug 27 14:52:51 2008
@@ -732,6 +732,12 @@
 			
 			/* Monitor loading progress */
 			Progress.status_set_operation (this, op);
+			
+			/* After load completes set loaded to TRUE */
+			op.watch ((op) => {if (op.is_successful ())
+                                _loaded_gnome_keyring = true;
+                            },  
+                      null);
 		}
 		
 		private void on_help_show (Gtk.Button button) {

Modified: trunk/src/vala-build.stamp
==============================================================================
--- trunk/src/vala-build.stamp	(original)
+++ trunk/src/vala-build.stamp	Wed Aug 27 14:52:51 2008
@@ -1 +1 @@
-1219785782
+1219848562