[at-spi2-core] Check gsettings schema, if available, for initial a11y state

[Mike Gorse <mgorse src gnome org>]

commit 7aeb5bb08476c5137b5e6284903c366166e4df19
Author: Mike Gorse <mgorse novell com>
Date:   Mon Oct 3 16:04:50 2011 -0500

    Check gsettings schema, if available, for initial a11y state
    
    At least on my system, at-spi-bus-launcher is being launched at start-up
    without --launch-immediately (may be a race), so it incorrectly assumed
    that accessibility was not enabled.  If the gsettings schema is present,
    then now we check that at start-up and consider it authoritative.

 bus/at-spi-bus-launcher.c |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)
---
diff --git a/bus/at-spi-bus-launcher.c b/bus/at-spi-bus-launcher.c
index 334258c..a7f2183 100644
--- a/bus/at-spi-bus-launcher.c
+++ b/bus/at-spi-bus-launcher.c
@@ -534,11 +534,15 @@ main (int    argc,
       g_error ("usage: %s [--launch-immediately] [--a11y=0|1]", argv[0]);
     }
 
-  if (!a11y_set)
-    _global_app->a11y_enabled = _global_app->launch_immediately;
-
   _global_app->desktop_schema = get_desktop_schema ();
 
+  if (!a11y_set)
+    {
+      _global_app->a11y_enabled = _global_app->desktop_schema
+                                  ? g_settings_get_boolean (_global_app->desktop_schema, "toolkit-accessibility")
+                                  : _global_app->launch_immediately;
+    }
+
   if (_global_app->desktop_schema)
     g_signal_connect (_global_app->desktop_schema,
                       "changed::toolkit-accessibility",