diff options
| author | Darin Adler <darin@src.gnome.org> | 2002-01-23 23:02:31 +0000 |
|---|---|---|
| committer | Darin Adler <darin@src.gnome.org> | 2002-01-23 23:02:31 +0000 |
| commit | 6b8ce47772edad524b3b7276eec46e8307c09cf9 (patch) | |
| tree | d6750b69181f193d39a397ac96bd90497c70d080 /libnautilus | |
| parent | e7c91ff2cf59c30c41c20a6b892675d8701d99bb (diff) | |
| download | nautilus-6b8ce47772edad524b3b7276eec46e8307c09cf9.tar.gz | |
Use newfangled gnome-client.h calls to turn off session management.
* components/adapter/main.c: (main):
* components/image-viewer/nautilus-image-view.c:
(init_server_factory):
* components/throbber/main.c: (main):
Use newfangled gnome-client.h calls to turn off session management.
* libnautilus/nautilus-view-standard-main.c:
(nautilus_view_standard_main_multi): Since we think
the per-display IID scheme is broken in bonobo-activation,
we turned it off there, rather than turning it off here.
Diffstat (limited to 'libnautilus')
| -rw-r--r-- | libnautilus/nautilus-view-standard-main.c | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/libnautilus/nautilus-view-standard-main.c b/libnautilus/nautilus-view-standard-main.c index 10dafc458..d23b25232 100644 --- a/libnautilus/nautilus-view-standard-main.c +++ b/libnautilus/nautilus-view-standard-main.c @@ -38,6 +38,7 @@ #include <gtk/gtkmain.h> #include <gtk/gtksignal.h> #include <libgnome/gnome-i18n.h> +#include <libgnomeui/gnome-client.h> #include <libgnomevfs/gnome-vfs-init.h> #include <stdlib.h> #include <string.h> @@ -191,17 +192,16 @@ nautilus_view_standard_main_multi (const char *executable_name, } #endif -#if GNOME2_CONVERSION_COMPLETE - /* Disable session manager connection */ - gnome_client_disable_master_connection (); -#endif - /* Initialize libraries. */ g_thread_init (NULL); gnome_vfs_init (); bonobo_ui_init (executable_name, version, &argc, argv); + /* Disable session manager connection */ + g_object_set (G_OBJECT (gnome_program_get()), + GNOME_CLIENT_PARAM_SM_CONNECT, FALSE, NULL); + if (post_initialize_callback != NULL) { (* post_initialize_callback) (); } @@ -214,11 +214,7 @@ 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)); -#else - registration_id = g_strdup (factory_iid); -#endif factory = bonobo_generic_factory_new (registration_id, make_object, &callback_data); |