From 5abcc1995419a91bebe2e42a5218a374e36533c3 Mon Sep 17 00:00:00 2001 From: Darin Adler Date: Sun, 28 Oct 2001 20:21:52 +0000 Subject: More GNOME 2 work. We now compile up to libnautilus-private and I'm * Lots of files: More GNOME 2 work. We now compile up to libnautilus-private and I'm working my way through the files in there. Also changed all the initialize_class and initialize to class_init and init. --- components/adapter/main.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'components/adapter/main.c') diff --git a/components/adapter/main.c b/components/adapter/main.c index 31153f595..e3b61a11f 100644 --- a/components/adapter/main.c +++ b/components/adapter/main.c @@ -26,8 +26,7 @@ #include -#include /* must come before gnome-init.h */ -#include /* must come before liboaf.h */ +#include /* must come before liboaf.h */ #include "nautilus-adapter-factory-server.h" #include @@ -36,7 +35,7 @@ #include #include #include -#include +#include #include #define META_FACTORY_IID "OAFIID:nautilus_adapter_factory_generic_factory:8e62e106-807d-4d37-b14a-00dc82ecf88f" @@ -100,8 +99,8 @@ main (int argc, char *argv[]) /* Disable session manager connection */ gnome_client_disable_master_connection (); - gnomelib_register_popt_table (oaf_popt_options, oaf_get_popt_table_name ()); - orb = oaf_init (argc, argv); + gnomelib_register_popt_table (bonobo_activation_popt_options, bonobo_activation_get_popt_table_name ()); + orb = bonobo_activation_init (argc, argv); /* Initialize libraries. */ gnome_init ("nautilus-adapter", VERSION, @@ -112,7 +111,7 @@ main (int argc, char *argv[]) /* Create the factory. */ - registration_id = oaf_make_registration_id (META_FACTORY_IID, g_getenv ("DISPLAY")); + registration_id = bonobo_activation_make_registration_id (META_FACTORY_IID, g_getenv ("DISPLAY")); factory = bonobo_generic_factory_new_multi (registration_id, adapter_factory_make_object, NULL); -- cgit v1.2.1