diff options
| author | Darin Adler <darin@src.gnome.org> | 2001-10-28 20:21:52 +0000 |
|---|---|---|
| committer | Darin Adler <darin@src.gnome.org> | 2001-10-28 20:21:52 +0000 |
| commit | 5abcc1995419a91bebe2e42a5218a374e36533c3 (patch) | |
| tree | 2f6c9699dc992039a973b0bd058aebfa2d820669 /components/adapter/main.c | |
| parent | b36a91ca55636af4137615a88c6e70a6dffe7802 (diff) | |
| download | nautilus-5abcc1995419a91bebe2e42a5218a374e36533c3.tar.gz | |
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.
Diffstat (limited to 'components/adapter/main.c')
| -rw-r--r-- | components/adapter/main.c | 11 |
1 files changed, 5 insertions, 6 deletions
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 <config.h> -#include <libgnome/gnome-defs.h> /* must come before gnome-init.h */ -#include <libgnomeui/gnome-init.h> /* must come before liboaf.h */ +#include <libgnome/gnome-init.h> /* must come before liboaf.h */ #include "nautilus-adapter-factory-server.h" #include <bonobo/bonobo-generic-factory.h> @@ -36,7 +35,7 @@ #include <gtk/gtksignal.h> #include <libgnomevfs/gnome-vfs-init.h> #include <eel/eel-debug.h> -#include <liboaf/liboaf.h> +#include <bonobo-activation/bonobo-activation.h> #include <stdlib.h> #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); |