diff options
| -rw-r--r-- | ChangeLog | 12 | ||||
| -rw-r--r-- | libnautilus/nautilus-view.c | 4 | ||||
| -rw-r--r-- | src/nautilus-navigation-window.c | 4 | ||||
| -rw-r--r-- | src/nautilus-object-window.c | 4 | ||||
| -rw-r--r-- | src/nautilus-sidebar-tabs.c | 8 | ||||
| -rw-r--r-- | src/nautilus-spatial-window.c | 4 | ||||
| -rw-r--r-- | src/nautilus-window.c | 4 |
7 files changed, 28 insertions, 12 deletions
@@ -1,3 +1,15 @@ +2002-02-20 Michael Meeks <michael@ximian.com> + + * libnautilus/nautilus-view.c + (nautilus_view_set_frame): don't spew debug as we + disconnect from a dead parent. + + * src/nautilus-sidebar-tabs.c + (tab_item_destroy): ditto. + + * src/nautilus-window. + (nautilus_window_unrealize): ditto. + 2002-02-19 Bastien Nocera <hadess@hadess.net> * src/nautilus-window-manage-views.c: diff --git a/libnautilus/nautilus-view.c b/libnautilus/nautilus-view.c index 112b24761..144cb5ee4 100644 --- a/libnautilus/nautilus-view.c +++ b/libnautilus/nautilus-view.c @@ -328,10 +328,12 @@ nautilus_view_set_frame (NautilusView *view, bonobo_event_source_client_remove_listener ( view->details->event_source, - BONOBO_OBJREF (listener), NULL); + BONOBO_OBJREF (listener), &ev); CORBA_Object_release (view->details->event_source, &ev); bonobo_object_unref (BONOBO_OBJECT (listener)); + + CORBA_exception_free (&ev); } if (frame != CORBA_OBJECT_NIL) { diff --git a/src/nautilus-navigation-window.c b/src/nautilus-navigation-window.c index 4620f7ebc..2d2d27ac8 100644 --- a/src/nautilus-navigation-window.c +++ b/src/nautilus-navigation-window.c @@ -867,8 +867,8 @@ nautilus_window_unrealize (GtkWidget *widget) property_bag = Bonobo_Control_getProperties (window->details->throbber, &ev); if (!BONOBO_EX (&ev) && property_bag != CORBA_OBJECT_NIL) { bonobo_event_source_client_remove_listener - (property_bag, window->details->throbber_listener, NULL); - bonobo_object_release_unref (property_bag, NULL); + (property_bag, window->details->throbber_listener, &ev); + bonobo_object_release_unref (property_bag, &ev); } CORBA_Object_release (window->details->throbber_listener, &ev); diff --git a/src/nautilus-object-window.c b/src/nautilus-object-window.c index 4620f7ebc..2d2d27ac8 100644 --- a/src/nautilus-object-window.c +++ b/src/nautilus-object-window.c @@ -867,8 +867,8 @@ nautilus_window_unrealize (GtkWidget *widget) property_bag = Bonobo_Control_getProperties (window->details->throbber, &ev); if (!BONOBO_EX (&ev) && property_bag != CORBA_OBJECT_NIL) { bonobo_event_source_client_remove_listener - (property_bag, window->details->throbber_listener, NULL); - bonobo_object_release_unref (property_bag, NULL); + (property_bag, window->details->throbber_listener, &ev); + bonobo_object_release_unref (property_bag, &ev); } CORBA_Object_release (window->details->throbber_listener, &ev); diff --git a/src/nautilus-sidebar-tabs.c b/src/nautilus-sidebar-tabs.c index 2be91318e..35aacf21d 100644 --- a/src/nautilus-sidebar-tabs.c +++ b/src/nautilus-sidebar-tabs.c @@ -359,14 +359,16 @@ tab_item_destroy (TabItem *item) } if (item->listener != CORBA_OBJECT_NIL) { + CORBA_exception_init (&ev); + property_bag = get_property_bag (item); if (property_bag != CORBA_OBJECT_NIL) { bonobo_event_source_client_remove_listener - (property_bag, item->listener, NULL); - bonobo_object_release_unref (property_bag, NULL); + (property_bag, item->listener, &ev); + bonobo_object_release_unref (property_bag, &ev); } - CORBA_exception_init (&ev); CORBA_Object_release (item->listener, &ev); + CORBA_exception_free (&ev); } diff --git a/src/nautilus-spatial-window.c b/src/nautilus-spatial-window.c index 4620f7ebc..2d2d27ac8 100644 --- a/src/nautilus-spatial-window.c +++ b/src/nautilus-spatial-window.c @@ -867,8 +867,8 @@ nautilus_window_unrealize (GtkWidget *widget) property_bag = Bonobo_Control_getProperties (window->details->throbber, &ev); if (!BONOBO_EX (&ev) && property_bag != CORBA_OBJECT_NIL) { bonobo_event_source_client_remove_listener - (property_bag, window->details->throbber_listener, NULL); - bonobo_object_release_unref (property_bag, NULL); + (property_bag, window->details->throbber_listener, &ev); + bonobo_object_release_unref (property_bag, &ev); } CORBA_Object_release (window->details->throbber_listener, &ev); diff --git a/src/nautilus-window.c b/src/nautilus-window.c index 4620f7ebc..2d2d27ac8 100644 --- a/src/nautilus-window.c +++ b/src/nautilus-window.c @@ -867,8 +867,8 @@ nautilus_window_unrealize (GtkWidget *widget) property_bag = Bonobo_Control_getProperties (window->details->throbber, &ev); if (!BONOBO_EX (&ev) && property_bag != CORBA_OBJECT_NIL) { bonobo_event_source_client_remove_listener - (property_bag, window->details->throbber_listener, NULL); - bonobo_object_release_unref (property_bag, NULL); + (property_bag, window->details->throbber_listener, &ev); + bonobo_object_release_unref (property_bag, &ev); } CORBA_Object_release (window->details->throbber_listener, &ev); |