[orca] Fix for bug 622764 - Remove the gconf dependency

[Joanmarie Diggs <joanied src gnome org>]

commit f402f00d0e5b60724f4afd97c4c61e73c7e68117
Author: Joanmarie Diggs <joanmarie diggs gmail com>
Date:   Sun Jun 12 20:42:35 2011 -0400

    Fix for bug 622764 - Remove the gconf dependency

 configure.in                       |    1 -
 src/orca/backends/Makefile.am      |    1 -
 src/orca/backends/gconf_backend.py |  408 ------------------------------------
 src/orca/orca.py                   |    2 +-
 src/orca/orca_gui_prefs.py         |   10 +-
 src/orca/settings.py               |    6 -
 src/orca/settings_manager.py       |    3 +-
 7 files changed, 3 insertions(+), 428 deletions(-)
---
diff --git a/configure.in b/configure.in
index 399af19..0bf945d 100644
--- a/configure.in
+++ b/configure.in
@@ -48,7 +48,6 @@ AM_CHECK_PYMOD(gobject,,,[AC_MSG_ERROR(Could not find python module: gobject)])
 # Don't require the DISPLAY to be set - the gtk checking will fail 
 # if DISPLAY is not set, and we don't like that.
 #AM_CHECK_PYMOD(gtk,gdk,,[AC_MSG_ERROR(Could not find python module: gtk.gdk)])
-AM_CHECK_PYMOD(gconf,,,[AC_MSG_ERROR(Could not find python module: gconf)])
 AM_CHECK_PYMOD(dbus,,,[AC_MSG_ERROR(Could not find python module: dbus)])
 AM_CHECK_PYMOD(pyatspi,,,[AC_MSG_ERROR(Could not find python module: pyatspi)])
 AM_CHECK_PYMOD(cairo,,,[AC_MSG_ERROR(Could not find python module: cairo)])
diff --git a/src/orca/backends/Makefile.am b/src/orca/backends/Makefile.am
index 4006067..0aefe99 100644
--- a/src/orca/backends/Makefile.am
+++ b/src/orca/backends/Makefile.am
@@ -2,7 +2,6 @@ orca_pathdir=$(pyexecdir)
 
 orca_python_PYTHON = \
         __init__.py \
-        gconf_backend.py\
         json_backend.py
 
 orca_pythondir=$(pyexecdir)/orca/backends
diff --git a/src/orca/orca.py b/src/orca/orca.py
index 70a1850..8531561 100644
--- a/src/orca/orca.py
+++ b/src/orca/orca.py
@@ -2282,7 +2282,7 @@ def main():
     # Do not run Orca if accessibility has not been enabled.
     # We do allow, however, one to force Orca to run via the
     # "-n" switch.  The main reason is so that things such
-    # as accessible login can work -- in those cases, the gconf
+    # as accessible login can work -- in those cases, the a11y
     # setting is typically not set since the gdm user does not
     # have a home.
     #
diff --git a/src/orca/orca_gui_prefs.py b/src/orca/orca_gui_prefs.py
index 2a2244a..cf7f438 100644
--- a/src/orca/orca_gui_prefs.py
+++ b/src/orca/orca_gui_prefs.py
@@ -854,15 +854,7 @@ class OrcaSetupGUI(orca_gtkbuilder.GtkBuilderWrapper):
         - systemName: the speech system name to use to set the active combo
         box item.
         """
-        # JD -> JH: We aren't expecting this string in quotes, yet we
-        # seem to be getting it that way from the gconf backend. That
-        # is causing the 'endswith(systemName)' test to fail. That in
-        # turn is resulting in our failing to find a match. I'm not
-        # suggesting this hack is the solution; I'm merely trying to
-        # make your hang go away. :-) If you comment this line, you
-        # should see the hang and the debug output -- assuming your
-        # active speech factory is speechdispatcherfactory.
-        #
+
         systemName = systemName.strip("'")
 
         if len(self.speechSystemsChoices) == 0:
diff --git a/src/orca/settings.py b/src/orca/settings.py
index dbe8b83..365dbbb 100644
--- a/src/orca/settings.py
+++ b/src/orca/settings.py
@@ -65,12 +65,6 @@ try:
 except:
     pass
 
-try:
-    import gconf
-    gconfClient = gconf.client_get_default()
-except:
-    gconfClient = None
-
 import pyatspi
 
 from acss import ACSS
diff --git a/src/orca/settings_manager.py b/src/orca/settings_manager.py
index cab0307..ae82412 100644
--- a/src/orca/settings_manager.py
+++ b/src/orca/settings_manager.py
@@ -54,9 +54,8 @@ class SettingsManager(object):
     def __init__(self, backend='json'):
         """Initialize a SettingsManager Object.
         If backend isn't defined then uses default backend, in this
-        case gconf-backend.
+        case json-backend.
         backend parameter can use the follow values:
-        backend='gconf'
         backend='json'
         """