[caribou] Use new GIO settings to determine if a11y is enabled.

[Eitan Isaacson <eitani src gnome org>]

commit f9d4f7bcf608810f977102ccb6bb32f98479eec6
Author: Eitan Isaacson <eitan monotonous org>
Date:   Sat Mar 5 22:30:07 2011 -0800

    Use new GIO settings to determine if a11y is enabled.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=643623

 caribou/ui/main.py |   19 +++++++++++++------
 1 files changed, 13 insertions(+), 6 deletions(-)
---
diff --git a/caribou/ui/main.py b/caribou/ui/main.py
index 2050906..3a7d19a 100644
--- a/caribou/ui/main.py
+++ b/caribou/ui/main.py
@@ -1,7 +1,7 @@
 import pyatspi
-from gi.repository import GConf
 from gi.repository import Gtk
 from gi.repository import Gdk
+from gi.repository import Gio
 
 from window import CaribouWindowEntry, Rectangle
 from keyboard import CaribouKeyboard
@@ -23,7 +23,6 @@ class Caribou:
         self.kb_factory = kb_factory
         kb = kb_factory()
         self.window = window_factory(kb)
-        self.client = GConf.Client.get_default()
         self._register_event_listeners()
         SettingsManager.layout.connect("value-changed",
                                        self._on_layout_changed)
@@ -68,10 +67,18 @@ class Caribou:
 
     def _get_a11y_enabled(self):
         try:
-            gconfc = GConf.Client.get_default()
-            atspi1 = gconfc.get_bool("/desktop/gnome/interface/accessibility")
-            atspi2 = gconfc.get_bool("/desktop/gnome/interface/accessibility2")
-            return atspi1 or atspi2
+            try:
+                settings = Gio.Settings('org.gnome.desktop.interface')
+                atspi = settings.get_boolean("toolkit-accessibility")
+                return atspi
+            except:
+                from gi.repository import GConf
+                gconfc = GConf.Client.get_default()
+                atspi1 = gconfc.get_bool(
+                    "/desktop/gnome/interface/accessibility")
+                atspi2 = gconfc.get_bool(
+                    "/desktop/gnome/interface/accessibility2")
+                return atspi1 or atspi2
         except:
             return False