summaryrefslogtreecommitdiff
path: root/components/adapter
diff options
context:
space:
mode:
authorDarin Adler <darin@src.gnome.org>2000-05-27 02:17:41 +0000
committerDarin Adler <darin@src.gnome.org>2000-05-27 02:17:41 +0000
commit63d4a318cbff5f7294f50ffad8d954afbffdcfc1 (patch)
treebce40ba32b6dee05f916231715052d48c2eacaf9 /components/adapter
parent7f5aef643238b6314f7f7e3a43d0b73651891e09 (diff)
downloadnautilus-63d4a318cbff5f7294f50ffad8d954afbffdcfc1.tar.gz
A little more desktop window work.
* src/nautilus-desktop-window.c: (nautilus_desktop_window_initialize_class), (nautilus_desktop_window_initialize), (nautilus_desktop_window_new): * src/nautilus-desktop-window.h: * src/ntl-app.c: (nautilus_app_startup), (nautilus_app_quit), (nautilus_app_create_window): * src/ntl-app.h: * src/ntl-main.c: (main): Made a desktop window that's created when you start the program if you pass the --desktop option. At the moment it's a normal window and not set up to take over the desktop. * libnautilus-extensions/nautilus-glib-extensions.c: (nautilus_self_check_glib_extensions): Fixed some broken self- checks. Now we have one really broken self-check in the nautilus-directory.c file. I might turn that one off soon so we can at least run the others. * libnautilus-extensions/nautilus-gtk-macros.h: Changed how some of the macros work. Few of these macros were used in Nautilus. I hope they aren't used in the Mozilla component, because then I broke it. * libnautilus-extensions/nautilus-list-column-title.c: (nautilus_list_column_title_motion), (nautilus_list_column_title_button_press), (nautilus_list_column_title_button_release): Updated to use NAUTILUS_INVOKE_METHOD instead of NAUTILUS_KLASS, because I renamed it to NAUTILUS_CLASS and had to change these anyway. A little sweep for code that should be using CORBA_Object_is_nil instead of direct compares with CORBA_OBJECT_NIL. * components/html/main.c: (url_requested_cb): * libnautilus-extensions/bonobo-stream-vfs.c: (bonobo_stream_create): * libnautilus/nautilus-undo-manager.c: (set_up_bonobo_control): * libnautilus/nautilus-undoable.c: (nautilus_undo_register_full), (nautilus_undo_unregister), (nautilus_undo): * src/file-manager/dfos.c: (dfos_new): Switch to use CORBA_Object_is_nil. * libnautilus/nautilus-undo-manager.c: (undo_manager_unref), (nautilus_attach_undo_manager), (nautilus_share_undo_manager), (set_up_bonobo_control): Do some missing duplicate and release calls. * libnautilus/nautilus-undoable.c: (nautilus_undo_unregister): Fix a place where we'd keep a reference to a freed list. Change O(n^2) walk of list by index to O(n) walk by pointer. * src/ntl-index-panel.c: (nautilus_index_panel_remove_meta_view): Changed g_warning to a g_return_if_fail, which was designed for cases just like this one. * src/ntl-view-bonobo-subdoc.c: (bonobo_subdoc_notify_location_change): Put in a better version of the FIXME. * RENAMING: More updates.
Diffstat (limited to 'components/adapter')
-rw-r--r--components/adapter/bonobo-stream-vfs.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/components/adapter/bonobo-stream-vfs.c b/components/adapter/bonobo-stream-vfs.c
index a1fda664b..182e0f06d 100644
--- a/components/adapter/bonobo-stream-vfs.c
+++ b/components/adapter/bonobo-stream-vfs.c
@@ -316,6 +316,7 @@ bonobo_stream_create (GnomeVFSHandle *fd)
{
BonoboStreamVFS *stream_vfs;
Bonobo_Stream corba_stream;
+ CORBA_Environment ev;
stream_vfs = gtk_type_new (bonobo_stream_vfs_get_type ());
if (stream_vfs == NULL)
@@ -326,10 +327,15 @@ bonobo_stream_create (GnomeVFSHandle *fd)
corba_stream = create_bonobo_stream_vfs (
BONOBO_OBJECT (stream_vfs));
- if (corba_stream == CORBA_OBJECT_NIL){
- gtk_object_destroy (GTK_OBJECT (stream_vfs));
+ CORBA_exception_init (&ev);
+
+ if (CORBA_Object_is_nil (corba_stream, &ev)){
+ gtk_object_unref (GTK_OBJECT (stream_vfs));
+ CORBA_exception_free (&ev);
return NULL;
}
+
+ CORBA_exception_free (&ev);
return bonobo_stream_vfs_construct (stream_vfs, corba_stream);
}