Commit 29f09213 authored by Gene Z. Ragan's avatar Gene Z. Ragan Committed by Gene Ragan
Browse files

Changes caused by the festival of renaming in OAF.

2000-08-11  Gene Z. Ragan  <gzr@eazel.com>

	* idl/GNOME_Desktop_FileOperationService.idl:
	* src/nautilus-application.c: (create_factory):
	Changes caused by the festival of renaming in OAF.
parent c97b4fcd
2000-08-11 Gene Z. Ragan <gzr@eazel.com>
* idl/GNOME_Desktop_FileOperationService.idl:
* src/nautilus-application.c: (create_factory):
Changes caused by the festival of renaming in OAF.
2000-08-11 Andy Hertzfeld <andy@eazel.com>
* src/nautilus-sidebar-tabs.c:
......
#include <gnome-factory.idl>
#include <oaf-factory.idl>
#include <Bonobo.idl>
module GNOME {
......
......@@ -72,13 +72,13 @@ static gboolean need_to_show_first_time_druid (void);
NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusApplication, nautilus_application, BONOBO_OBJECT_TYPE)
static POA_Bonobo_GenericFactory__epv factory_epv = {
static POA_GNOME_ObjectFactory__epv factory_epv = {
NULL,
&manufactures,
&create_object
};
static PortableServer_ServantBase__epv base_epv;
static POA_Bonobo_GenericFactory__vepv vepv = {
static POA_GNOME_ObjectFactory__vepv vepv = {
&base_epv,
&factory_epv
};
......@@ -135,8 +135,8 @@ create_factory (PortableServer_POA poa,
BonoboObjectServant *servant;
servant = g_new0 (BonoboObjectServant, 1);
((POA_Bonobo_GenericFactory *) servant)->vepv = &vepv;
POA_Bonobo_GenericFactory__init ((PortableServer_Servant) servant, ev);
((POA_GNOME_ObjectFactory *) servant)->vepv = &vepv;
POA_GNOME_ObjectFactory__init ((PortableServer_Servant) servant, ev);
return bonobo_object_activate_servant (BONOBO_OBJECT (bonobo_object), servant);
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment