diff options
| author | Maciej Stachowiak <mstachow@src.gnome.org> | 2000-09-17 16:01:25 +0000 |
|---|---|---|
| committer | Maciej Stachowiak <mstachow@src.gnome.org> | 2000-09-17 16:01:25 +0000 |
| commit | 5ab8a426b5a8a2f427dfb0e36030207662dbaa38 (patch) | |
| tree | 3a3e03c5b5b3fdd45ce45c5ce79e1d694bed891f /components/adapter/nautilus-adapter-factory-server.c | |
| parent | 91bfd64adabda089dd8a48cf815dc10cd57bdb49 (diff) | |
| download | nautilus-5ab8a426b5a8a2f427dfb0e36030207662dbaa38.tar.gz | |
More work towards bug 1994. I'm not yet checking in the code to
actually use the adapter yet, but it sort of works on my system.
* nautilus-clean.sh: Added nautilus-adapter
* components/adapter/main.c (main): Do the stop in debugger
trick. Also, initialize gnome-vfs (and threads). Duh!
* components/adapter/nautilus-adapter-factory-server.c
(impl_Nautilus_ComponentAdapterFactory_create_adapter):
CORBA_Object_duplicate the object reference we return, because
CORBA's just cool like that.
* components/adapter/nautilus-adapter.c
(nautilus_adapter_new): Show me the widgets, Lebowski. That's
right, a few missing gtk_widget_show calls were the only bugs in
this hairy mess of CORBA/Bonobo code (well, other than the obvious
resource leaks).
* components/adapter/nautilus-adapter.oafinfo: Updated to match
reality.
* libnautilus-extensions/nautilus-icon-factory.c
(vfs_file_exists, nautilus_make_directory_and_parents,
make_thumbnail_path, nautilus_icon_factory_get_thumbnail_uri,
check_for_thumbnails): Put FIXMEs for a bunch of synchronous I/O
that is making it a pain in the ass to test 1994.
* src/nautilus-component-adapter-factory.c:
Fill in the right IID.
(nautilus_component_adapter_factory_initialize): Allocate the details.
(nautilus_component_adapter_factory_create_adapter): Return the
actual adapted view, not CORBA_OOBJECT_BIL (hello?).
* src/nautilus-main.c (main): Add "ORBit" log domain to ones that
stop in the debugger.
Diffstat (limited to 'components/adapter/nautilus-adapter-factory-server.c')
| -rw-r--r-- | components/adapter/nautilus-adapter-factory-server.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/components/adapter/nautilus-adapter-factory-server.c b/components/adapter/nautilus-adapter-factory-server.c index 4110a5013..382c1361a 100644 --- a/components/adapter/nautilus-adapter-factory-server.c +++ b/components/adapter/nautilus-adapter-factory-server.c @@ -39,7 +39,6 @@ #include <libnautilus-extensions/nautilus-gtk-macros.h> #include <libnautilus-adapter/nautilus-adapter-factory.h> - typedef struct { POA_Nautilus_ComponentAdapterFactory servant; NautilusAdapterFactoryServer *bonobo_object; @@ -151,8 +150,9 @@ impl_Nautilus_ComponentAdapterFactory_create_adapter (PortableServer_Servant se gtk_signal_connect (GTK_OBJECT (adapter), "destroy", adapter_object_destroyed, factory_servant->bonobo_object); - - return bonobo_object_corba_objref (BONOBO_OBJECT (nautilus_adapter_get_nautilus_view (adapter))); + return CORBA_Object_duplicate + (bonobo_object_corba_objref + (BONOBO_OBJECT (nautilus_adapter_get_nautilus_view (adapter))), ev); } } |