[orca/gnome-3-0] Fix for bug 647824 - Turning screen reader "off" should not be equated with "do not autostart in the

[Joanmarie Diggs <joanied src gnome org>]

commit bb9fabc4b22b05a7de130fa5c1a34e02f0049b9b
Author: Joanmarie Diggs <joanmarie diggs gmail com>
Date:   Fri Apr 15 10:15:21 2011 -0400

    Fix for bug 647824 - Turning screen reader "off" should not be equated with "do not autostart in the future"

 src/orca/orca.py      |    7 +------
 src/orca/orca_quit.py |    2 +-
 2 files changed, 2 insertions(+), 7 deletions(-)
---
diff --git a/src/orca/orca.py b/src/orca/orca.py
index 636d55d..349cea6 100644
--- a/src/orca/orca.py
+++ b/src/orca/orca.py
@@ -43,10 +43,6 @@ a11yAppSettings = Settings('org.gnome.desktop.a11y.applications')
 def getOrcaEnabled(gsetting, key):
     return gsetting.get_boolean(key)
 
-def setOrcaEnabled(gsetting, key, enabled):
-    gsetting = gsetting or a11yAppSettings
-    gsetting.set_boolean(key, enabled)
-
 def onEnabledChanged(gsetting, key):
     if not key == 'screen-reader-enabled':
         return
@@ -1917,7 +1913,7 @@ def quitOrca(script=None, inputEvent=None):
     """
 
     if settings.quitOrcaNoConfirmation:
-        setOrcaEnabled(a11yAppSettings, 'screen-reader-enabled', False)
+        shutdown()
     else:
         try:
             module = __import__(settings.quitModule,
@@ -2028,7 +2024,6 @@ def init(registry):
         signal.alarm(0)
 
     _initialized = True
-    setOrcaEnabled(a11yAppSettings, 'screen-reader-enabled', True)
     a11yAppSettings.connect('changed', onEnabledChanged)
     return True
 
diff --git a/src/orca/orca_quit.py b/src/orca/orca_quit.py
index d5ec6b1..b58cccc 100644
--- a/src/orca/orca_quit.py
+++ b/src/orca/orca_quit.py
@@ -91,7 +91,7 @@ class OrcaQuitGUI(orca_gtkbuilder.GtkBuilderWrapper):
         - widget: the component that generated the signal.
         """
 
-        orca.setOrcaEnabled(None, 'screen-reader-enabled', False)
+        orca.shutdown()
 
     def quitDialogDestroyed(self, widget):
         """Signal handler for the "destroyed" signal for the quitDialog