diff --git a/gnome-session-2.20.0-safe-a11y-startup.patch b/gnome-session-2.20.0-safe-a11y-startup.patch new file mode 100644 index 0000000..9042e6d --- /dev/null +++ b/gnome-session-2.20.0-safe-a11y-startup.patch @@ -0,0 +1,53 @@ +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 (); diff --git a/gnome-session-main-init.patch b/gnome-session-main-init.patch deleted file mode 100644 index 9824680..0000000 --- a/gnome-session-main-init.patch +++ /dev/null @@ -1,40 +0,0 @@ ---- gnome-session/main.c -+++ gnome-session/main.c -@@ -641,18 +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); - g_option_context_add_main_entries (goption_context, options, GETTEXT_PACKAGE); -@@ -756,6 +744,18 @@ - - gsm_motd_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 (); -+ } -+ - gtk_main (); - - gsm_motd_stop (); diff --git a/gnome-session.changes b/gnome-session.changes index a39a129..5f7b8a6 100644 --- a/gnome-session.changes +++ b/gnome-session.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Fri Nov 9 01:55:25 CET 2007 - hpj@suse.de + +- Rename gnome-session-main-init.patch to + gnome-session-2.20.0-safe-a11y-startup.patch, and change it so + a11y is started up before the user session, but still after + exporting necessary env vars. Fixes part of Novell bug #332498. + ------------------------------------------------------------------- Wed Nov 7 19:22:44 CET 2007 - maw@suse.de diff --git a/gnome-session.spec b/gnome-session.spec index c1856a9..20ac637 100644 --- a/gnome-session.spec +++ b/gnome-session.spec @@ -16,7 +16,7 @@ BuildRequires: CASA-devel control-center2-devel fdupes gnome-common gnome-deskt License: GPL v2 or later; LGPL v2.1 or later Group: System/GUI/GNOME Version: 2.20.1 -Release: 1 +Release: 2 Summary: Session Tools for the GNOME 2.x Desktop Source: %{name}-%{version}.tar.bz2 Source1: gnome @@ -57,7 +57,7 @@ Patch11: gnome-session-migrate-session-manual.patch Patch12: gnome-session-wm-switch.patch Patch13: gnome-session-no-devel-fatals.patch Patch14: gnome-session-tile-ui.patch -Patch15: gnome-session-main-init.patch +Patch15: gnome-session-2.20.0-safe-a11y-startup.patch Patch16: gnome-session-sound.patch Patch17: gnome-session-gcc4.3-fixes.patch Url: http://www.gnome.org @@ -107,7 +107,7 @@ gnome-patch-translation-prepare %patch12 %patch13 %patch14 -p1 -%patch15 +%patch15 -p1 %patch16 %patch17 -p1 %endif @@ -161,6 +161,11 @@ rm -rf $RPM_BUILD_ROOT %files lang -f %{name}-2.0.lang %changelog +* Fri Nov 09 2007 - hpj@suse.de +- Rename gnome-session-main-init.patch to + gnome-session-2.20.0-safe-a11y-startup.patch, and change it so + a11y is started up before the user session, but still after + exporting necessary env vars. Fixes part of Novell bug #332498. * Wed Nov 07 2007 - maw@suse.de - Update to version 2.20.1 + Now requires a newer version of gtk2