gnome-session/gnome-session-main-init.patch

47 lines
1.4 KiB
Diff

--- gnome-session-2.19.6/gnome-session/main.c
+++ gnome-session-2.19.6/gnome-session/main.c
@@ -641,17 +641,6 @@
gconf_client = gsm_get_conf_client ();
gconf_client_add_dir (gconf_client, GSM_GCONF_CONFIG_PREFIX, GCONF_CLIENT_PRELOAD_ONELEVEL, NULL);
- env_a_t_support = g_getenv (ACCESSIBILITY_ENV);
- if (env_a_t_support)
- a_t_support = atoi (env_a_t_support);
- else
- a_t_support = gconf_client_get_bool (gconf_client, ACCESSIBILITY_KEY, NULL);
-
- if (a_t_support)
- {
- gsm_assistive_registry_start ();
- gsm_at_set_gtk_modules ();
- }
goption_context = g_option_context_new (N_("- Manage the GNOME session"));
g_option_context_set_translation_domain (goption_context, GETTEXT_PACKAGE);
@@ -670,9 +659,25 @@
exit (1);
}
+/* set up the SESSION_MANAGER environ */
initialize_ice ();
fprintf (stderr, "SESSION_MANAGER=%s\n", g_getenv ("SESSION_MANAGER"));
+
+/* moved here to ensure it gets the SESSION_MANAGER environ */
+ env_a_t_support = g_getenv (ACCESSIBILITY_ENV);
+ if (env_a_t_support)
+ a_t_support = atoi (env_a_t_support);
+ else
+ a_t_support = gconf_client_get_bool (gconf_client, ACCESSIBILITY_KEY, NULL);
+
+ if (a_t_support)
+ {
+ gsm_assistive_registry_start ();
+ gsm_at_set_gtk_modules ();
+ }
+
+
/* Make sure children see the right value for DISPLAY. This is
useful if --display was specified on the command line. */
display_str = gdk_get_display ();