Index: gnome-session/gnome-session/main.c
===================================================================
RCS file: /cvs/gnome/gnome-session/gnome-session/main.c,v
retrieving revision 1.80
diff -p -u -r1.80 main.c
--- gnome-session/gnome-session/main.c	26 Jul 2006 12:46:36 -0000	1.80
+++ gnome-session/gnome-session/main.c	16 Oct 2006 00:27:29 -0000
@@ -328,7 +328,8 @@ main (int argc, char *argv[])
   char *session_name_env;
   Session *the_session;
   gboolean splashing;
-  gboolean a_t_support;
+  gboolean a_t_support = FALSE;
+  GConfValue* a_t_value;
   GError *err;
   int status;
   char *display_str;
@@ -349,6 +350,11 @@ main (int argc, char *argv[])
 	{
 	  putenv ("G_DEBUG=fatal_criticals");
 	  g_log_set_always_fatal (G_LOG_LEVEL_CRITICAL);
+
+          /* Also enable accessibility by default in unstable releases 
+	   *of GNOME. 
+	   */
+	  a_t_support = TRUE;
 	}
     }
   g_strfreev (versions);
@@ -391,10 +397,17 @@ main (int argc, char *argv[])
         }
     }
   
-  /* Read the config option early, so that we know if a11y is set or not */ 
+  /* Read the config option early, so that we know if a11y is set or not.
+   * If the a11y key is set, we always honor it, regardless if we're in
+   * an unstable release that has a11y enabled by default.  This permits
+   * people to disable a11y in unstable releases if need be.
+   */ 
   gconf_client = gsm_get_conf_client ();
   gconf_client_add_dir (gconf_client, GSM_GCONF_CONFIG_PREFIX, GCONF_CLIENT_PRELOAD_ONELEVEL, NULL); 
-  a_t_support = gconf_client_get_bool (gconf_client, ACCESSIBILITY_KEY, NULL);
+
+  a_t_value = gconf_client_get (gconf_client, ACCESSIBILITY_KEY, NULL);
+  if (a_t_value)
+    a_t_support = gconf_value_get_bool (a_t_value);
 
   if (a_t_support)
     gsm_at_set_gtk_modules ();
@@ -438,7 +451,6 @@ main (int argc, char *argv[])
   splashing      = gconf_client_get_bool (gconf_client, SPLASH_SCREEN_KEY, NULL);
   autosave       = gconf_client_get_bool (gconf_client, AUTOSAVE_MODE_KEY, NULL);
   logout_prompt  = gconf_client_get_bool (gconf_client, LOGOUT_PROMPT_KEY, NULL);
-  a_t_support    = gconf_client_get_bool (gconf_client, ACCESSIBILITY_KEY, NULL);
 
   gconf_client_notify_add (gconf_client,
 			   AUTOSAVE_MODE_KEY,
