OBS User unknown 2007-08-29 20:27:12 +00:00 committed by Git OBS Bridge
parent 83b10d85ea
commit 21507a18bf
3 changed files with 23 additions and 20 deletions

View File

@ -1,6 +1,6 @@
--- gnome-session-2.19.6/gnome-session/main.c --- gnome-session/main.c
+++ gnome-session-2.19.6/gnome-session/main.c +++ gnome-session/main.c
@@ -641,17 +641,6 @@ @@ -641,18 +641,6 @@
gconf_client = gsm_get_conf_client (); gconf_client = gsm_get_conf_client ();
gconf_client_add_dir (gconf_client, GSM_GCONF_CONFIG_PREFIX, GCONF_CLIENT_PRELOAD_ONELEVEL, NULL); gconf_client_add_dir (gconf_client, GSM_GCONF_CONFIG_PREFIX, GCONF_CLIENT_PRELOAD_ONELEVEL, NULL);
@ -15,24 +15,19 @@
- gsm_assistive_registry_start (); - gsm_assistive_registry_start ();
- gsm_at_set_gtk_modules (); - gsm_at_set_gtk_modules ();
- } - }
-
goption_context = g_option_context_new (N_("- Manage the GNOME session")); goption_context = g_option_context_new (N_("- Manage the GNOME session"));
g_option_context_set_translation_domain (goption_context, GETTEXT_PACKAGE); g_option_context_set_translation_domain (goption_context, GETTEXT_PACKAGE);
@@ -670,9 +659,25 @@ g_option_context_add_main_entries (goption_context, options, GETTEXT_PACKAGE);
exit (1); @@ -756,6 +744,18 @@
}
+/* set up the SESSION_MANAGER environ */ gsm_motd_start ();
initialize_ice ();
fprintf (stderr, "SESSION_MANAGER=%s\n", g_getenv ("SESSION_MANAGER"));
+ + // move this down so the environments from above get set up
+/* moved here to ensure it gets the SESSION_MANAGER environ */ + // correctly before assistive modules activate items
+ env_a_t_support = g_getenv (ACCESSIBILITY_ENV); + env_a_t_support = g_getenv (ACCESSIBILITY_ENV);
+ if (env_a_t_support) + if (env_a_t_support)
+ a_t_support = atoi (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) + if (a_t_support)
+ { + {
@ -40,7 +35,6 @@
+ gsm_at_set_gtk_modules (); + gsm_at_set_gtk_modules ();
+ } + }
+ +
+ gtk_main ();
/* Make sure children see the right value for DISPLAY. This is
useful if --display was specified on the command line. */ gsm_motd_stop ();
display_str = gdk_get_display ();

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Tue Aug 28 23:07:36 CEST 2007 - cgaisford@novell.com
- Further testing showed that the a11y needs to be done much lower
in the loop so I've moved it down right before the gtk-main
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Aug 27 21:49:55 CEST 2007 - cgaisford@novell.com Mon Aug 27 21:49:55 CEST 2007 - cgaisford@novell.com

View File

@ -16,7 +16,7 @@ BuildRequires: CASA-devel control-center2-devel fdupes gnome-common gnome-deskt
License: GPL v2 or later, LGPL v2 or later License: GPL v2 or later, LGPL v2 or later
Group: System/GUI/GNOME Group: System/GUI/GNOME
Version: 2.19.6 Version: 2.19.6
Release: 18 Release: 20
Summary: Session Tools for the GNOME 2.x Desktop Summary: Session Tools for the GNOME 2.x Desktop
Source: %{name}-%{version}.tar.bz2 Source: %{name}-%{version}.tar.bz2
Source1: gnome Source1: gnome
@ -106,7 +106,7 @@ gnome-patch-translation-prepare
%patch12 %patch12
%patch13 %patch13
%patch14 -p1 %patch14 -p1
%patch15 -p1 %patch15
%endif %endif
gnome-patch-translation-update gnome-patch-translation-update
@ -161,6 +161,9 @@ rm -rf $RPM_BUILD_ROOT
%files lang -f %{name}-2.0.lang %files lang -f %{name}-2.0.lang
%changelog %changelog
* Tue Aug 28 2007 - cgaisford@novell.com
- Further testing showed that the a11y needs to be done much lower
in the loop so I've moved it down right before the gtk-main
* Mon Aug 27 2007 - cgaisford@novell.com * Mon Aug 27 2007 - cgaisford@novell.com
- Added patch to move the a11y initialization lower in the startup - Added patch to move the a11y initialization lower in the startup
so the session-manager has a chance to get started. so the session-manager has a chance to get started.