diff options
| author | Thomas Canty <tommydal@optushome.com.au> | 2001-11-11 00:50:14 +0000 |
|---|---|---|
| committer | Thomas Canty <tommy@src.gnome.org> | 2001-11-11 00:50:14 +0000 |
| commit | 8b7d17f0a68c37c2c662e50a63833c51e5d3372a (patch) | |
| tree | 75a7fa03d6a2f33798840e5efebc903b6d812554 /libnautilus/nautilus-view-standard-main.c | |
| parent | 9a9ae4d9c8d5dab2eeb19c11a682e2a65bc034a4 (diff) | |
| download | nautilus-8b7d17f0a68c37c2c662e50a63833c51e5d3372a.tar.gz | |
Work towards getting the components compiling and working. History, News,
2001-11-10 Thomas Canty <tommydal@optushome.com.au>
* Lots of files:
Work towards getting the components compiling and
working. History, News, Notes and Throbber components
are now working.
* libnautilus/nautilus-view-standard-main.c:
Change the initialisation to use bonobo_ui_init
* src/nautilus-window-toolbars.c:
Re-enable the throbber.
Diffstat (limited to 'libnautilus/nautilus-view-standard-main.c')
| -rw-r--r-- | libnautilus/nautilus-view-standard-main.c | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/libnautilus/nautilus-view-standard-main.c b/libnautilus/nautilus-view-standard-main.c index dbc7395b1..e2045d79f 100644 --- a/libnautilus/nautilus-view-standard-main.c +++ b/libnautilus/nautilus-view-standard-main.c @@ -33,6 +33,7 @@ #include <X11/Xlib.h> #include <bonobo/bonobo-generic-factory.h> #include <bonobo/bonobo-main.h> +#include <bonobo/bonobo-ui-main.h> #include <gdk/gdkx.h> #include <gtk/gtkmain.h> #include <gtk/gtksignal.h> @@ -155,10 +156,11 @@ nautilus_view_standard_main_multi (const char *executable_name, GVoidFunc post_initialize_callback, void *user_data) { - CORBA_ORB orb; BonoboGenericFactory *factory; CallbackData callback_data; +#ifdef GNOME2_CONVERSION_COMPLETE char *registration_id; +#endif g_return_val_if_fail (executable_name != NULL, EXIT_FAILURE); g_return_val_if_fail (version != NULL, EXIT_FAILURE); @@ -192,9 +194,8 @@ nautilus_view_standard_main_multi (const char *executable_name, #if GNOME2_CONVERSION_COMPLETE gnomelib_register_popt_table (bonobo_activation_popt_options, bonobo_activation_get_popt_table_name ()); -#endif orb = bonobo_activation_init (argc, argv); - +#endif /* Initialize libraries. */ #if GNOME2_CONVERSION_COMPLETE gnome_init (executable_name, version, argc, argv); @@ -203,7 +204,9 @@ nautilus_view_standard_main_multi (const char *executable_name, gnome_vfs_init (); #if GNOME2_CONVERSION_COMPLETE bonobo_init (orb, CORBA_OBJECT_NIL, CORBA_OBJECT_NIL); + #endif + bonobo_ui_init (executable_name, version, &argc, argv); if (post_initialize_callback != NULL) { (* post_initialize_callback) (); @@ -217,13 +220,18 @@ nautilus_view_standard_main_multi (const char *executable_name, callback_data.delayed_quit_timeout_id = 0; /* Create the factory. */ + +#ifdef GNOME2_CONVERSION_COMPLETE registration_id = bonobo_activation_make_registration_id (factory_iid, DisplayString (GDK_DISPLAY ())); - factory = bonobo_generic_factory_new (registration_id, +#endif + + factory = bonobo_generic_factory_new (factory_iid, make_object, &callback_data); +#ifdef GNOME2_CONVERSION_COMPLETE g_free (registration_id); - +#endif /* Loop until we have no more objects. */ do { bonobo_main (); |