seahorse r2853 - in trunk: . libseahorse

[sadam svn gnome org]

Author: sadam
Date: Fri Feb 27 16:11:49 2009
New Revision: 2853
URL: http://svn.gnome.org/viewvc/seahorse?rev=2853&view=rev

Log:
2009-02-27  Adam Schreiber  <sadam clemson edu>

    * libseahorse/seahorse-context.c: Stop segfaulting when objects with 
NULL 
    ids are removed.



Modified:
   trunk/ChangeLog
   trunk/libseahorse/seahorse-context.c

Modified: trunk/libseahorse/seahorse-context.c
==============================================================================
--- trunk/libseahorse/seahorse-context.c	(original)
+++ trunk/libseahorse/seahorse-context.c	Fri Feb 27 16:11:49 2009
@@ -153,7 +153,7 @@
     g_hash_table_foreach (sctx->pv->objects_by_source, hash_to_ref_slist, &objects);
     for (l = objects; l; l = g_slist_next (l)) {
             seahorse_context_remove_object (sctx, l->data);
-            g_object_unref (l->data);
+            g_object_unref (G_OBJECT (l->data));
     }
     g_slist_free (objects);
 
@@ -737,6 +737,7 @@
         sctx = seahorse_context_for_app ();
     g_return_if_fail (SEAHORSE_IS_CONTEXT (sctx));
     g_return_if_fail (SEAHORSE_IS_OBJECT (sobj));
+    g_return_if_fail (seahorse_object_get_id (sobj) != 0);
     
     k = hashkey_by_source (seahorse_object_get_source (sobj), 
                            seahorse_object_get_id (sobj));