gnome-keyring r1532 - in trunk: . pkcs11/user-store

[nnielsen svn gnome org]

Author: nnielsen
Date: Sun Feb  8 04:57:00 2009
New Revision: 1532
URL: http://svn.gnome.org/viewvc/gnome-keyring?rev=1532&view=rev

Log:
Don't try to load objects that we add to the store ourselves.

Modified:
   trunk/ChangeLog
   trunk/pkcs11/user-store/gck-user-storage.c

Modified: trunk/pkcs11/user-store/gck-user-storage.c
==============================================================================
--- trunk/pkcs11/user-store/gck-user-storage.c	(original)
+++ trunk/pkcs11/user-store/gck-user-storage.c	Sun Feb  8 04:57:00 2009
@@ -1028,8 +1028,16 @@
 		g_return_if_reached ();
 	}
 	
+	/* We don't want to get signals about this item being added */
+	g_signal_handlers_block_by_func (self->file, data_file_entry_added, self);
+	g_signal_handlers_block_by_func (self->file, data_file_entry_changed, self);
+	
 	res = gck_data_file_create_entry (self->file, identifier, 
 	                                  is_private ? GCK_DATA_FILE_SECTION_PRIVATE : GCK_DATA_FILE_SECTION_PUBLIC);
+	
+	g_signal_handlers_unblock_by_func (self->file, data_file_entry_added, self);
+	g_signal_handlers_unblock_by_func (self->file, data_file_entry_changed, self);
+
 	switch(res) {
 	case GCK_DATA_FAILURE:
 	case GCK_DATA_UNRECOGNIZED: