From bac6352078a38dd7ea59126ddbf7a453fa19f550 Mon Sep 17 00:00:00 2001 From: Elliot Lee Date: Wed, 8 Dec 1999 22:44:11 +0000 Subject: Use the "recommended" way of getting the base epv. Use the "recommended" way of getting the base epv. --- libnautilus/nautilus-view-frame.c | 8 ++++++-- libnautilus/nautilus-view-frame.h | 2 +- libnautilus/nautilus-view.c | 8 ++++++-- libnautilus/nautilus-view.h | 2 +- libnautilus/ntl-view-client.c | 8 ++++++-- libnautilus/ntl-view-client.h | 2 +- libnautilus/ntl-view-frame.c | 8 ++++++-- libnautilus/ntl-view-frame.h | 2 +- 8 files changed, 28 insertions(+), 12 deletions(-) (limited to 'libnautilus') diff --git a/libnautilus/nautilus-view-frame.c b/libnautilus/nautilus-view-frame.c index 49b6f92de..4babe5b72 100644 --- a/libnautilus/nautilus-view-frame.c +++ b/libnautilus/nautilus-view-frame.c @@ -68,10 +68,12 @@ POA_Nautilus_View__epv libnautilus_Nautilus_View_epv = (gpointer) & impl_Nautilus_View_notify_selection_change }; +static PortableServer_ServantBase__epv base_epv = { NULL}; + static POA_Nautilus_View__vepv impl_Nautilus_View_vepv = { - &gnome_object_base_epv, - &gnome_object_epv, + &base_epv, + NULL, &libnautilus_Nautilus_View_epv }; @@ -146,6 +148,8 @@ 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->view = view; servant_init_func((PortableServer_Servant) newservant, ev); diff --git a/libnautilus/nautilus-view-frame.h b/libnautilus/nautilus-view-frame.h index 10db704da..9f0f5ccfd 100644 --- a/libnautilus/nautilus-view-frame.h +++ b/libnautilus/nautilus-view-frame.h @@ -56,7 +56,7 @@ struct _NautilusViewClientClass GtkBinClass *parent_class; - gpointer servant_init_func, servant_destroy_func, vepv, ; + gpointer servant_init_func, servant_destroy_func, vepv; guint view_client_signals[5]; }; diff --git a/libnautilus/nautilus-view.c b/libnautilus/nautilus-view.c index 49b6f92de..4babe5b72 100644 --- a/libnautilus/nautilus-view.c +++ b/libnautilus/nautilus-view.c @@ -68,10 +68,12 @@ POA_Nautilus_View__epv libnautilus_Nautilus_View_epv = (gpointer) & impl_Nautilus_View_notify_selection_change }; +static PortableServer_ServantBase__epv base_epv = { NULL}; + static POA_Nautilus_View__vepv impl_Nautilus_View_vepv = { - &gnome_object_base_epv, - &gnome_object_epv, + &base_epv, + NULL, &libnautilus_Nautilus_View_epv }; @@ -146,6 +148,8 @@ 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->view = view; servant_init_func((PortableServer_Servant) newservant, ev); diff --git a/libnautilus/nautilus-view.h b/libnautilus/nautilus-view.h index 10db704da..9f0f5ccfd 100644 --- a/libnautilus/nautilus-view.h +++ b/libnautilus/nautilus-view.h @@ -56,7 +56,7 @@ struct _NautilusViewClientClass GtkBinClass *parent_class; - gpointer servant_init_func, servant_destroy_func, vepv, ; + gpointer servant_init_func, servant_destroy_func, vepv; guint view_client_signals[5]; }; diff --git a/libnautilus/ntl-view-client.c b/libnautilus/ntl-view-client.c index 49b6f92de..4babe5b72 100644 --- a/libnautilus/ntl-view-client.c +++ b/libnautilus/ntl-view-client.c @@ -68,10 +68,12 @@ POA_Nautilus_View__epv libnautilus_Nautilus_View_epv = (gpointer) & impl_Nautilus_View_notify_selection_change }; +static PortableServer_ServantBase__epv base_epv = { NULL}; + static POA_Nautilus_View__vepv impl_Nautilus_View_vepv = { - &gnome_object_base_epv, - &gnome_object_epv, + &base_epv, + NULL, &libnautilus_Nautilus_View_epv }; @@ -146,6 +148,8 @@ 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->view = view; servant_init_func((PortableServer_Servant) newservant, ev); diff --git a/libnautilus/ntl-view-client.h b/libnautilus/ntl-view-client.h index 10db704da..9f0f5ccfd 100644 --- a/libnautilus/ntl-view-client.h +++ b/libnautilus/ntl-view-client.h @@ -56,7 +56,7 @@ struct _NautilusViewClientClass GtkBinClass *parent_class; - gpointer servant_init_func, servant_destroy_func, vepv, ; + gpointer servant_init_func, servant_destroy_func, vepv; guint view_client_signals[5]; }; diff --git a/libnautilus/ntl-view-frame.c b/libnautilus/ntl-view-frame.c index 49b6f92de..4babe5b72 100644 --- a/libnautilus/ntl-view-frame.c +++ b/libnautilus/ntl-view-frame.c @@ -68,10 +68,12 @@ POA_Nautilus_View__epv libnautilus_Nautilus_View_epv = (gpointer) & impl_Nautilus_View_notify_selection_change }; +static PortableServer_ServantBase__epv base_epv = { NULL}; + static POA_Nautilus_View__vepv impl_Nautilus_View_vepv = { - &gnome_object_base_epv, - &gnome_object_epv, + &base_epv, + NULL, &libnautilus_Nautilus_View_epv }; @@ -146,6 +148,8 @@ 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->view = view; servant_init_func((PortableServer_Servant) newservant, ev); diff --git a/libnautilus/ntl-view-frame.h b/libnautilus/ntl-view-frame.h index 10db704da..9f0f5ccfd 100644 --- a/libnautilus/ntl-view-frame.h +++ b/libnautilus/ntl-view-frame.h @@ -56,7 +56,7 @@ struct _NautilusViewClientClass GtkBinClass *parent_class; - gpointer servant_init_func, servant_destroy_func, vepv, ; + gpointer servant_init_func, servant_destroy_func, vepv; guint view_client_signals[5]; }; -- cgit v1.2.1