seahorse r2764 - in trunk: . daemon

[nnielsen svn gnome org]

Author: nnielsen
Date: Thu Feb  5 04:06:01 2009
New Revision: 2764
URL: http://svn.gnome.org/viewvc/seahorse?rev=2764&view=rev

Log:
Don't return objects without ids via libcryptui. Fixes bug #570454

Modified:
   trunk/ChangeLog
   trunk/daemon/seahorse-service-keyset.c

Modified: trunk/daemon/seahorse-service-keyset.c
==============================================================================
--- trunk/daemon/seahorse-service-keyset.c	(original)
+++ trunk/daemon/seahorse-service-keyset.c	Thu Feb  5 04:06:01 2009
@@ -102,13 +102,19 @@
 	objects = seahorse_set_get_objects (SEAHORSE_SET (keyset));
 	for (l = objects; l; l = g_list_next (l)) {
 		id = seahorse_context_object_to_dbus (SCTX_APP (), SEAHORSE_OBJECT (l->data));
-		g_array_append_val (array, id);
+		if (id == NULL)
+			g_warning ("object has no identifier usable over dbus");
+		else
+			g_array_append_val (array, id);
 
 		/* Children of the object */
 		children = seahorse_object_get_children (SEAHORSE_OBJECT (l->data));
 		for (k = children; k; k = g_list_next (k)) {
 			id = seahorse_context_object_to_dbus (SCTX_APP (), SEAHORSE_OBJECT (k->data));
-			g_array_append_val (array, id);
+			if (id == NULL)
+				g_warning ("child object has no identifier usable over dbus");
+			else
+				g_array_append_val (array, id);
 		}
 	}