[accerciser] Check for toolkit-accessibility key using gsettings



commit 4f1d67e87cb855bb6731d91da1e1b7cd1fb52ca6
Author: Javier Hernández Antúnez <jhernandez emergya es>
Date:   Sat Jun 11 04:02:37 2011 +0200

    Check for toolkit-accessibility key using gsettings

 src/accerciser.in                |   46 ++++++++++++++++++++-----------------
 src/lib/accerciser/accerciser.py |   14 +++++-----
 2 files changed, 32 insertions(+), 28 deletions(-)
---
diff --git a/src/accerciser.in b/src/accerciser.in
index 0b4e63c..d74680b 100755
--- a/src/accerciser.in
+++ b/src/accerciser.in
@@ -25,27 +25,31 @@ libs = os.path.join(sys.prefix, 'lib',
 # point to the proper site-packages path
 sys.path.insert(1, libs)
 
-import pygtk
-pygtk.require('2.0')
-
-import gnome
-# make this program accessible
-props = { gnome.PARAM_APP_DATADIR : os.path.join(sys.prefix, 'share')}
-gnome.program_init('accerciser', '@VERSION@', 
-                   properties=props, argv=['accerciser'] + sys.argv[1:])
-
-import gtk
-# initialize threads
-# get global icon resources
-it = gtk.IconTheme()
-try:
-  icons = [it.load_icon('@PACKAGE@', size, gtk.ICON_LOOKUP_NO_SVG) 
-           for size in (16, 22, 32)]
-except Exception:
-  # ignore errors, and just don't use the icon
-  pass
-else:
-  gtk.window_set_default_icon_list(*icons)
+# TODO: Remove unnecessary stuff here
+# We're commenting lines below for a sanity check
+# regarding gsettings calls.
+#
+#import pygtk
+#pygtk.require('2.0')
+#
+#import gnome
+## make this program accessible
+#props = { gnome.PARAM_APP_DATADIR : os.path.join(sys.prefix, 'share')}
+#gnome.program_init('accerciser', '@VERSION@', 
+#                   properties=props, argv=['accerciser'] + sys.argv[1:])
+#
+#import gtk
+## initialize threads
+## get global icon resources
+#it = gtk.IconTheme()
+#try:
+#  icons = [it.load_icon('@PACKAGE@', size, gtk.ICON_LOOKUP_NO_SVG) 
+#           for size in (16, 22, 32)]
+#except Exception:
+#  # ignore errors, and just don't use the icon
+#  pass
+#else:
+#  gtk.window_set_default_icon_list(*icons)
   
 import accerciser
 accerciser.main()
diff --git a/src/lib/accerciser/accerciser.py b/src/lib/accerciser/accerciser.py
index 4b060e7..1859a8f 100644
--- a/src/lib/accerciser/accerciser.py
+++ b/src/lib/accerciser/accerciser.py
@@ -13,6 +13,10 @@ All rights reserved. This program and the accompanying materials are made
 available under the terms of the BSD which accompanies this distribution, and 
 is available at U{http://www.opensource.org/licenses/bsd-license.php}
 '''
+
+from gi.repository.Gio import Settings
+a11yAppSettings = Settings('org.gnome.desktop.interface')
+
 import pygtk
 pygtk.require('2.0')
 import gtk
@@ -32,9 +36,7 @@ from tools import Tools
 from i18n import _, N_
 import wnck
 from gnome import program_get
-import gconf
 from hotkey_manager import HotkeyManager, HotkeyTreeView
-import gconf
 from about_dialog import AccerciserAboutDialog
 from prefs_dialog import AccerciserPreferencesDialog
 from main_window import AccerciserMainWindow
@@ -121,11 +123,10 @@ class Main(Tools):
   def _showNoA11yDialog(self):
     '''
     Shows a dialog with a relevant message when desktop accessibility seems to
-    be disabled. If desktop accessibility is disabled in gconf, prompts the
+    be disabled. If desktop accessibility is disabled in gsettings, prompts the
     user to enable it.
     '''
-    cl = gconf.client_get_default()
-    if not cl.get_bool('/desktop/gnome/interface/accessibility'):
+    if not a11yAppSettings.get_boolean('toolkit-accessibility'):
       message = _('Accerciser could not see the applications on your desktop.  '
                   'You must enable desktop accessibility to fix this problem.  '
                   'Do you want to enable it now?')
@@ -138,8 +139,7 @@ class Main(Tools):
   def _onNoA11yResponse(self, dialog, response_id):
     dialog.destroy()
     if response_id == gtk.RESPONSE_YES:
-      cl = gconf.client_get_default()
-      cl.set_bool('/desktop/gnome/interface/accessibility', True)
+      a11yAppSettings.set_boolean('toolkit-accessibility', True)
       dialog = gtk.MessageDialog(
         self.window,
         type=gtk.MESSAGE_INFO,



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]