54 lines
2.2 KiB
Diff
54 lines
2.2 KiB
Diff
|
diff -upr gnome-session-2.20.0-pre/gnome-session/gsm-at-startup.c gnome-session-2.20.0-post/gnome-session/gsm-at-startup.c
|
||
|
|
--- gnome-session-2.20.0-pre/gnome-session/gsm-at-startup.c 2007-09-17 13:36:00.000000000 -0500
|
||
|
|
+++ gnome-session-2.20.0-post/gnome-session/gsm-at-startup.c 2007-11-07 20:13:13.000000000 -0600
|
||
|
|
@@ -66,7 +66,7 @@ gsm_assistive_registry_start (void)
|
||
|
|
gdk_window_set_events (w, GDK_PROPERTY_CHANGE_MASK);
|
||
|
|
gsm_exec_command_line_async (command, NULL);
|
||
|
|
gdk_window_add_filter (w, gsm_assistive_filter_watch, &tid);
|
||
|
|
- tid = g_timeout_add_seconds (5, gsm_assistive_filter_timeout, NULL);
|
||
|
|
+ tid = g_timeout_add_seconds (10, gsm_assistive_filter_timeout, NULL);
|
||
|
|
|
||
|
|
gtk_main ();
|
||
|
|
|
||
|
|
diff -upr gnome-session-2.20.0-pre/gnome-session/main.c gnome-session-2.20.0-post/gnome-session/main.c
|
||
|
|
--- gnome-session-2.20.0-pre/gnome-session/main.c 2007-11-07 20:03:51.000000000 -0600
|
||
|
|
+++ gnome-session-2.20.0-post/gnome-session/main.c 2007-11-07 20:08:43.000000000 -0600
|
||
|
|
@@ -641,18 +641,6 @@ main (int argc, char *argv[])
|
||
|
|
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);
|
||
|
|
g_option_context_add_main_entries (goption_context, options, GETTEXT_PACKAGE);
|
||
|
|
@@ -752,6 +740,18 @@ main (int argc, char *argv[])
|
||
|
|
if (splashing)
|
||
|
|
splash_start ();
|
||
|
|
|
||
|
|
+ /* move this down so the environments from above get set up
|
||
|
|
+ correctly before assistive modules activate items */
|
||
|
|
+ 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 ();
|
||
|
|
+ }
|
||
|
|
+
|
||
|
|
start_session (the_session);
|
||
|
|
|
||
|
|
gsm_motd_start ();
|