diff options
| author | Elliot Lee <sopwith@src.gnome.org> | 1999-12-14 02:37:14 +0000 |
|---|---|---|
| committer | Elliot Lee <sopwith@src.gnome.org> | 1999-12-14 02:37:14 +0000 |
| commit | 3fd015a88040ec8ed1eb8de55db93a7675458d06 (patch) | |
| tree | 50ac6f195c353ff1bbffa4796b1dcbafa8e2fbe8 /libnautilus | |
| parent | 65c2e7dd64adfc221f412ce371ccd89d1e53a84d (diff) | |
| download | nautilus-3fd015a88040ec8ed1eb8de55db93a7675458d06.tar.gz | |
The whole wazoo. It would work, except for a bug I blame on gnome-vfs.
The whole wazoo. It would work, except for a bug I blame on gnome-vfs.
Diffstat (limited to 'libnautilus')
| -rw-r--r-- | libnautilus/Makefile.am | 2 | ||||
| -rw-r--r-- | libnautilus/nautilus-view-frame.c | 4 | ||||
| -rw-r--r-- | libnautilus/nautilus-view.c | 4 | ||||
| -rw-r--r-- | libnautilus/ntl-view-client.c | 4 | ||||
| -rw-r--r-- | libnautilus/ntl-view-frame.c | 4 |
5 files changed, 14 insertions, 4 deletions
diff --git a/libnautilus/Makefile.am b/libnautilus/Makefile.am index 5cd2e798b..cbae225f1 100644 --- a/libnautilus/Makefile.am +++ b/libnautilus/Makefile.am @@ -9,6 +9,7 @@ libnautilusincludedir=$(includedir)/libnautilus libnautilusinclude_HEADERS= \ ntl-view-client.h \ ntl-meta-view-client.h \ + ntl-content-view-client.h \ nautilus.h \ gnome-icon-container-dnd.h \ gnome-icon-container-layout.h \ @@ -22,6 +23,7 @@ libnautilusinclude_HEADERS= \ libnautilus_la_SOURCES=$(nautilus_idl_sources) \ ntl-view-client.c \ ntl-meta-view-client.c \ + ntl-content-view-client.c \ gnome-icon-container-dnd.c \ gnome-icon-container-layout.c \ gnome-icon-container.c \ diff --git a/libnautilus/nautilus-view-frame.c b/libnautilus/nautilus-view-frame.c index 35c478db3..5b426193d 100644 --- a/libnautilus/nautilus-view-frame.c +++ b/libnautilus/nautilus-view-frame.c @@ -150,9 +150,10 @@ impl_Nautilus_View__create(NautilusViewClient *view, CORBA_Environment * ev) newservant->servant.vepv = view_class->vepv; if(!newservant->servant.vepv->GNOME_Unknown_epv) newservant->servant.vepv->GNOME_Unknown_epv = gnome_object_get_epv(); - newservant->view = view; servant_init_func((PortableServer_Servant) newservant, ev); + newservant->view = view; + retval = gnome_object_new_from_servant(newservant); gtk_signal_connect(GTK_OBJECT(retval), "destroy", GTK_SIGNAL_FUNC(impl_Nautilus_View__destroy), newservant); @@ -302,6 +303,7 @@ nautilus_view_client_init (NautilusViewClient *view) CORBA_exception_init(&ev); view->view_client = impl_Nautilus_View__create(view, &ev); + gnome_object_add_interface(view->control, view->view_client); CORBA_exception_free(&ev); } diff --git a/libnautilus/nautilus-view.c b/libnautilus/nautilus-view.c index 35c478db3..5b426193d 100644 --- a/libnautilus/nautilus-view.c +++ b/libnautilus/nautilus-view.c @@ -150,9 +150,10 @@ impl_Nautilus_View__create(NautilusViewClient *view, CORBA_Environment * ev) newservant->servant.vepv = view_class->vepv; if(!newservant->servant.vepv->GNOME_Unknown_epv) newservant->servant.vepv->GNOME_Unknown_epv = gnome_object_get_epv(); - newservant->view = view; servant_init_func((PortableServer_Servant) newservant, ev); + newservant->view = view; + retval = gnome_object_new_from_servant(newservant); gtk_signal_connect(GTK_OBJECT(retval), "destroy", GTK_SIGNAL_FUNC(impl_Nautilus_View__destroy), newservant); @@ -302,6 +303,7 @@ nautilus_view_client_init (NautilusViewClient *view) CORBA_exception_init(&ev); view->view_client = impl_Nautilus_View__create(view, &ev); + gnome_object_add_interface(view->control, view->view_client); CORBA_exception_free(&ev); } diff --git a/libnautilus/ntl-view-client.c b/libnautilus/ntl-view-client.c index 35c478db3..5b426193d 100644 --- a/libnautilus/ntl-view-client.c +++ b/libnautilus/ntl-view-client.c @@ -150,9 +150,10 @@ impl_Nautilus_View__create(NautilusViewClient *view, CORBA_Environment * ev) newservant->servant.vepv = view_class->vepv; if(!newservant->servant.vepv->GNOME_Unknown_epv) newservant->servant.vepv->GNOME_Unknown_epv = gnome_object_get_epv(); - newservant->view = view; servant_init_func((PortableServer_Servant) newservant, ev); + newservant->view = view; + retval = gnome_object_new_from_servant(newservant); gtk_signal_connect(GTK_OBJECT(retval), "destroy", GTK_SIGNAL_FUNC(impl_Nautilus_View__destroy), newservant); @@ -302,6 +303,7 @@ nautilus_view_client_init (NautilusViewClient *view) CORBA_exception_init(&ev); view->view_client = impl_Nautilus_View__create(view, &ev); + gnome_object_add_interface(view->control, view->view_client); CORBA_exception_free(&ev); } diff --git a/libnautilus/ntl-view-frame.c b/libnautilus/ntl-view-frame.c index 35c478db3..5b426193d 100644 --- a/libnautilus/ntl-view-frame.c +++ b/libnautilus/ntl-view-frame.c @@ -150,9 +150,10 @@ impl_Nautilus_View__create(NautilusViewClient *view, CORBA_Environment * ev) newservant->servant.vepv = view_class->vepv; if(!newservant->servant.vepv->GNOME_Unknown_epv) newservant->servant.vepv->GNOME_Unknown_epv = gnome_object_get_epv(); - newservant->view = view; servant_init_func((PortableServer_Servant) newservant, ev); + newservant->view = view; + retval = gnome_object_new_from_servant(newservant); gtk_signal_connect(GTK_OBJECT(retval), "destroy", GTK_SIGNAL_FUNC(impl_Nautilus_View__destroy), newservant); @@ -302,6 +303,7 @@ nautilus_view_client_init (NautilusViewClient *view) CORBA_exception_init(&ev); view->view_client = impl_Nautilus_View__create(view, &ev); + gnome_object_add_interface(view->control, view->view_client); CORBA_exception_free(&ev); } |