2007-08-29 22:27:12 +02:00
|
|
|
--- gnome-session/main.c
|
|
|
|
+++ gnome-session/main.c
|
|
|
|
@@ -641,18 +641,6 @@
|
2007-08-24 23:49:08 +02:00
|
|
|
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 ();
|
|
|
|
- }
|
2007-08-29 22:27:12 +02:00
|
|
|
-
|
2007-08-24 23:49:08 +02:00
|
|
|
goption_context = g_option_context_new (N_("- Manage the GNOME session"));
|
|
|
|
g_option_context_set_translation_domain (goption_context, GETTEXT_PACKAGE);
|
2007-08-29 22:27:12 +02:00
|
|
|
g_option_context_add_main_entries (goption_context, options, GETTEXT_PACKAGE);
|
|
|
|
@@ -756,6 +744,18 @@
|
2007-08-24 23:49:08 +02:00
|
|
|
|
2007-08-29 22:27:12 +02:00
|
|
|
gsm_motd_start ();
|
2007-08-24 23:49:08 +02:00
|
|
|
|
2007-09-06 22:13:40 +02:00
|
|
|
+ /* move this down so the environments from above get set up
|
|
|
|
+ correctly before assistive modules activate items */
|
2007-08-24 23:49:08 +02:00
|
|
|
+ env_a_t_support = g_getenv (ACCESSIBILITY_ENV);
|
|
|
|
+ if (env_a_t_support)
|
|
|
|
+ a_t_support = atoi (env_a_t_support);
|
|
|
|
+
|
|
|
|
+ if (a_t_support)
|
|
|
|
+ {
|
|
|
|
+ gsm_assistive_registry_start ();
|
|
|
|
+ gsm_at_set_gtk_modules ();
|
|
|
|
+ }
|
|
|
|
+
|
2007-08-29 22:27:12 +02:00
|
|
|
gtk_main ();
|
|
|
|
|
|
|
|
gsm_motd_stop ();
|