push out.

push out.

8 files changed, 32 insertions, 8 deletions

diff --git a/libnautilus/nautilus-view-frame.c b/libnautilus/nautilus-view-frame.c
index 4babe5b72..4d2f771bb 100644
--- a/libnautilus/nautilus-view-frame.c
+++ b/libnautilus/nautilus-view-frame.c
@@ -148,8 +148,7 @@ impl_Nautilus_View__create(NautilusViewClient *view, CORBA_Environment * ev)
    servant_init_func = view_class->servant_init_func;
    newservant = g_new0(impl_POA_Nautilus_View, 1);
    newservant->servant.vepv = view_class->vepv;
-   if(!newservant->servant.vepv->GNOME_Unknown_epv)
-     newservant->servant.vepv->GNOME_Unknown_epv = gnome_object_get_epv();
+   newservant->servant.vepv->GNOME_Unknown_epv = gnome_object_get_epv(FALSE);
    newservant->view = view;
    servant_init_func((PortableServer_Servant) newservant, ev);
 
@@ -434,3 +433,9 @@ nautilus_view_client_size_allocate (GtkWidget     *widget,
   if (bin->child && GTK_WIDGET_VISIBLE (bin->child))
     gtk_widget_size_allocate (bin->child, &child_allocation);
 }
+
+GnomeObject *
+nautilus_view_client_get_gnome_object    (NautilusViewClient        *view)
+{
+  return view->control;
+}
diff --git a/libnautilus/nautilus-view-frame.h b/libnautilus/nautilus-view-frame.h
index 9f0f5ccfd..e2f668077 100644
--- a/libnautilus/nautilus-view-frame.h
+++ b/libnautilus/nautilus-view-frame.h
@@ -78,6 +78,7 @@ void    nautilus_view_client_request_selection_change (NautilusViewClient
 						       Nautilus_SelectionRequestInfo *loc);
 void    nautilus_view_client_request_status_change    (NautilusViewClient        *view,
 						       Nautilus_StatusRequestInfo *loc);
+GnomeObject *nautilus_view_client_get_gnome_object    (NautilusViewClient        *view);
 
 #ifdef __cplusplus
 }
diff --git a/libnautilus/nautilus-view.c b/libnautilus/nautilus-view.c
index 4babe5b72..4d2f771bb 100644
--- a/libnautilus/nautilus-view.c
+++ b/libnautilus/nautilus-view.c
@@ -148,8 +148,7 @@ impl_Nautilus_View__create(NautilusViewClient *view, CORBA_Environment * ev)
    servant_init_func = view_class->servant_init_func;
    newservant = g_new0(impl_POA_Nautilus_View, 1);
    newservant->servant.vepv = view_class->vepv;
-   if(!newservant->servant.vepv->GNOME_Unknown_epv)
-     newservant->servant.vepv->GNOME_Unknown_epv = gnome_object_get_epv();
+   newservant->servant.vepv->GNOME_Unknown_epv = gnome_object_get_epv(FALSE);
    newservant->view = view;
    servant_init_func((PortableServer_Servant) newservant, ev);
 
@@ -434,3 +433,9 @@ nautilus_view_client_size_allocate (GtkWidget     *widget,
   if (bin->child && GTK_WIDGET_VISIBLE (bin->child))
     gtk_widget_size_allocate (bin->child, &child_allocation);
 }
+
+GnomeObject *
+nautilus_view_client_get_gnome_object    (NautilusViewClient        *view)
+{
+  return view->control;
+}
diff --git a/libnautilus/nautilus-view.h b/libnautilus/nautilus-view.h
index 9f0f5ccfd..e2f668077 100644
--- a/libnautilus/nautilus-view.h
+++ b/libnautilus/nautilus-view.h
@@ -78,6 +78,7 @@ void    nautilus_view_client_request_selection_change (NautilusViewClient
 						       Nautilus_SelectionRequestInfo *loc);
 void    nautilus_view_client_request_status_change    (NautilusViewClient        *view,
 						       Nautilus_StatusRequestInfo *loc);
+GnomeObject *nautilus_view_client_get_gnome_object    (NautilusViewClient        *view);
 
 #ifdef __cplusplus
 }
diff --git a/libnautilus/ntl-view-client.c b/libnautilus/ntl-view-client.c
index 4babe5b72..4d2f771bb 100644
--- a/libnautilus/ntl-view-client.c
+++ b/libnautilus/ntl-view-client.c
@@ -148,8 +148,7 @@ impl_Nautilus_View__create(NautilusViewClient *view, CORBA_Environment * ev)
    servant_init_func = view_class->servant_init_func;
    newservant = g_new0(impl_POA_Nautilus_View, 1);
    newservant->servant.vepv = view_class->vepv;
-   if(!newservant->servant.vepv->GNOME_Unknown_epv)
-     newservant->servant.vepv->GNOME_Unknown_epv = gnome_object_get_epv();
+   newservant->servant.vepv->GNOME_Unknown_epv = gnome_object_get_epv(FALSE);
    newservant->view = view;
    servant_init_func((PortableServer_Servant) newservant, ev);
 
@@ -434,3 +433,9 @@ nautilus_view_client_size_allocate (GtkWidget     *widget,
   if (bin->child && GTK_WIDGET_VISIBLE (bin->child))
     gtk_widget_size_allocate (bin->child, &child_allocation);
 }
+
+GnomeObject *
+nautilus_view_client_get_gnome_object    (NautilusViewClient        *view)
+{
+  return view->control;
+}
diff --git a/libnautilus/ntl-view-client.h b/libnautilus/ntl-view-client.h
index 9f0f5ccfd..e2f668077 100644
--- a/libnautilus/ntl-view-client.h
+++ b/libnautilus/ntl-view-client.h
@@ -78,6 +78,7 @@ void    nautilus_view_client_request_selection_change (NautilusViewClient
 						       Nautilus_SelectionRequestInfo *loc);
 void    nautilus_view_client_request_status_change    (NautilusViewClient        *view,
 						       Nautilus_StatusRequestInfo *loc);
+GnomeObject *nautilus_view_client_get_gnome_object    (NautilusViewClient        *view);
 
 #ifdef __cplusplus
 }
diff --git a/libnautilus/ntl-view-frame.c b/libnautilus/ntl-view-frame.c
index 4babe5b72..4d2f771bb 100644
--- a/libnautilus/ntl-view-frame.c
+++ b/libnautilus/ntl-view-frame.c
@@ -148,8 +148,7 @@ impl_Nautilus_View__create(NautilusViewClient *view, CORBA_Environment * ev)
    servant_init_func = view_class->servant_init_func;
    newservant = g_new0(impl_POA_Nautilus_View, 1);
    newservant->servant.vepv = view_class->vepv;
-   if(!newservant->servant.vepv->GNOME_Unknown_epv)
-     newservant->servant.vepv->GNOME_Unknown_epv = gnome_object_get_epv();
+   newservant->servant.vepv->GNOME_Unknown_epv = gnome_object_get_epv(FALSE);
    newservant->view = view;
    servant_init_func((PortableServer_Servant) newservant, ev);
 
@@ -434,3 +433,9 @@ nautilus_view_client_size_allocate (GtkWidget     *widget,
   if (bin->child && GTK_WIDGET_VISIBLE (bin->child))
     gtk_widget_size_allocate (bin->child, &child_allocation);
 }
+
+GnomeObject *
+nautilus_view_client_get_gnome_object    (NautilusViewClient        *view)
+{
+  return view->control;
+}
diff --git a/libnautilus/ntl-view-frame.h b/libnautilus/ntl-view-frame.h
index 9f0f5ccfd..e2f668077 100644
--- a/libnautilus/ntl-view-frame.h
+++ b/libnautilus/ntl-view-frame.h
@@ -78,6 +78,7 @@ void    nautilus_view_client_request_selection_change (NautilusViewClient
 						       Nautilus_SelectionRequestInfo *loc);
 void    nautilus_view_client_request_status_change    (NautilusViewClient        *view,
 						       Nautilus_StatusRequestInfo *loc);
+GnomeObject *nautilus_view_client_get_gnome_object    (NautilusViewClient        *view);
 
 #ifdef __cplusplus
 }