diff options
| author | Darin Adler <darin@src.gnome.org> | 2001-04-16 19:01:56 +0000 |
|---|---|---|
| committer | Darin Adler <darin@src.gnome.org> | 2001-04-16 19:01:56 +0000 |
| commit | 41b1aeb02f2d55caf14433b6be639776aaec0280 (patch) | |
| tree | 375eb585d229ca913310868aa2fed0f513ad998e /src | |
| parent | 88eb050895ac4ba9e3a428224e99a16d0fd35689 (diff) | |
| download | nautilus-41b1aeb02f2d55caf14433b6be639776aaec0280.tar.gz | |
Fixed the problem that was making the image view crash. We want to unref
* src/nautilus-view-frame.c: (destroy_view), (attach_view): Fixed
the problem that was making the image view crash. We want to unref
right away, but not release the CORBA object reference until we
are done.
* libnautilus-extensions/nautilus-volume-monitor.c:
(nautilus_volume_monitor_initialize_class),
(get_removable_volumes), (volume_is_removable),
(volume_is_read_only), (mount_volume_get_cdrom_name),
(mount_volume_activate_cdda), (mount_volume_activate_cdrom),
(get_current_mount_list), (verify_current_mount_state),
(get_cdrom_type), (load_additional_mount_list_info):
Some code cleanups. Got rid of a few ifdefs.
Diffstat (limited to 'src')
| -rw-r--r-- | src/nautilus-view-frame.c | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/src/nautilus-view-frame.c b/src/nautilus-view-frame.c index c9a9d810b..8bb02e99a 100644 --- a/src/nautilus-view-frame.c +++ b/src/nautilus-view-frame.c @@ -322,13 +322,18 @@ stop_activation (NautilusViewFrame *view) static void destroy_view (NautilusViewFrame *view) { + CORBA_Environment ev; + if (view->details->view == CORBA_OBJECT_NIL) { return; } g_free (view->details->view_iid); view->details->view_iid = NULL; - + + CORBA_exception_init (&ev); + CORBA_Object_release (view->details->view, &ev); + CORBA_exception_free (&ev); view->details->view = CORBA_OBJECT_NIL; nautilus_bonobo_object_call_when_remote_object_disappears @@ -755,6 +760,7 @@ static void attach_view (NautilusViewFrame *view, BonoboObjectClient *client) { + CORBA_Environment ev; GtkWidget *widget; /* Either create an adapter or query for the Nautilus:View @@ -771,7 +777,10 @@ attach_view (NautilusViewFrame *view, } create_corba_objects (view); - bonobo_object_release_unref (view->details->view, NULL); + + CORBA_exception_init (&ev); + Bonobo_Unknown_unref (view->details->view, &ev); + CORBA_exception_free (&ev); widget = bonobo_control_frame_get_widget (view->details->control_frame); |