[Nautilus-list] Re: Nautilus 1.0.6 and Bonobo 1.0.16

[Michael Meeks <michael ximian com>]

Hi Federic,

On 14 Nov 2001, Frederic Crozat wrote:
> first, you set component->priv->container to CORBA_OBJECT_NIL, then if
> container is not NIL, you call bonobo_ui_component_rm on component,   
> which will assert if component->priv->container is CORBA_OBJECT_NIL.. 
>  Therefore, it asserts everytime :((
   
        Heh :-) sure - doh; essentialy we need to set it to NIL to avoid a
race; so ... I'll inline the CORBA method in the shutdown and commit.
   
Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/bonobo/ChangeLog,v
retrieving revision 1.1146
diff -u -p -u -r1.1146 ChangeLog
--- ChangeLog	2001/11/14 21:39:24	1.1146
+++ ChangeLog	2001/11/14 21:57:35
@@ -1,5 +1,11 @@
 2001-11-15  Michael Meeks  <michael ximian com>
 
+	* bonobo/bonobo-ui-component.c
+	(bonobo_ui_component_unset_container): fix Federic's
+	report - doh.
+
+2001-11-15  Michael Meeks  <michael ximian com>
+
 	* bonobo/bonobo-ui-util.c (free_node_cache_entry):
 	xmlFree the entry->tree.
 	(free_loaded_node_cache): NULL the pointer after free.
Index: bonobo/bonobo-ui-component.c
===================================================================
RCS file: /cvs/gnome/bonobo/bonobo/bonobo-ui-component.c,v
retrieving revision 1.55
diff -u -p -u -r1.55 bonobo-ui-component.c
--- bonobo/bonobo-ui-component.c	2001/11/12 21:40:55	1.55
+++ bonobo/bonobo-ui-component.c	2001/11/14 21:57:38
@@ -1374,10 +1374,9 @@ bonobo_ui_component_unset_container (Bon
 
 		CORBA_exception_init (&ev);
 
-		bonobo_ui_component_rm (component, "/", &ev);
-
 		name = component->priv->name ? component->priv->name : "";
 
+		Bonobo_UIContainer_removeNode (container, "/", name, &ev);
 		Bonobo_UIContainer_deregisterComponent (container, name, 
&ev);
 		
 		if (BONOBO_EX (&ev))

	HTH,

		Michael.

-- 
 mmeeks gnu org  <><, Pseudo Engineer, itinerant idiot