[orca] Remove the command line option to enter the Preferences dialog on launch

[Joanmarie Diggs <joanied src gnome org>]

commit a49ee0114d533922577ed8119a3dbe4bbe8739b5
Author: Joanmarie Diggs <jdiggs igalia com>
Date:   Sat May 12 22:51:23 2012 -0400

    Remove the command line option to enter the Preferences dialog on launch
    
    * We already have a keyboard command for accomplishing this
    * Users launching Orca via their distro's tool for doing so can't use
      this option.
    * The "clean settings" functionality associated with this option has
      apparently been broken since at least GNOME 3.0 (and possibly earlier).
      That no one has reported this suggests that this option isn't being
      used anyway.

 docs/man/orca.1          |    5 -----
 help/C/introduction.page |    6 ------
 src/orca/orca.py         |   23 +----------------------
 3 files changed, 1 insertions(+), 33 deletions(-)
---
diff --git a/docs/man/orca.1 b/docs/man/orca.1
index b285705..279fa66 100644
--- a/docs/man/orca.1
+++ b/docs/man/orca.1
@@ -40,11 +40,6 @@ an AT-SPI enabled shell (such as gnome-terminal), can also
 suspend the desktop until Orca is killed.
 .SH OPTIONS
 .TP
-.B \-s, --setup, --gui-setup
-When starting
-.BR orca ,
-bring up the GUI configuration dialog.
-.TP
 .B \-t, --text-setup
 When starting
 .BR orca ,
diff --git a/help/C/introduction.page b/help/C/introduction.page
index 88c9a5c..27aad28 100644
--- a/help/C/introduction.page
+++ b/help/C/introduction.page
@@ -94,12 +94,6 @@
         </item>
         <item>
           <p>
-            <cmd>-s</cmd>, <cmd>--setup</cmd>, <cmd>--gui-setup</cmd>:
-            Set up user preferences
-          </p>
-        </item>
-        <item>
-          <p>
             <cmd>-t</cmd>, <cmd>--text-setup</cmd>: Set up user preferences
             (text version)
           </p>
diff --git a/src/orca/orca.py b/src/orca/orca.py
index 2cb1f00..f6ad147 100644
--- a/src/orca/orca.py
+++ b/src/orca/orca.py
@@ -107,8 +107,6 @@ class Options(argparse.Namespace):
         self.settings = {}
         self.cannotEnable = []
         self._validFeaturesPrinted = False
-        self.setupRequested = False
-        self.showGUI = False
         self.debug = False
         self.debugFile = None
 
@@ -125,10 +123,6 @@ class Options(argparse.Namespace):
         if self.profiles == None:
             self.profiles = []
 
-        if self.guiSetupRequested or self.textSetupRequested:
-            self.setupRequested = True
-            self.showGUI = self.desktopRunning and not self.textSetupRequested
-
         if self.showHelp:
             self._printMessageAndExit(parser.print_help)
 
@@ -292,15 +286,6 @@ parser.add_argument(
     help = _("Send debug output to the specified file"))
 
 parser.add_argument(
-    "-s", "--setup", "--gui-setup", action = "store_true",
-    dest = "guiSetupRequested",
-    # Translators: this is the description of the command line option
-    # '-s, --setup, --gui-setup' that will initially display a GUI dialog that
-    # would allow the user to set their Orca preferences.
-    #
-    help = _("Set up user preferences"))
-
-parser.add_argument(
     "-t", "--text-setup", action = "store_true",
     dest = "textSetupRequested",
     # Translators: this is the description of the command line option
@@ -1425,7 +1410,7 @@ def main():
     if not _settingsManager.isAccessibilityEnabled():
         _settingsManager.setAccessibility(True)
 
-    if options.setupRequested and not options.showGUI:
+    if options.textSetupRequested:
         _showPreferencesConsole()
 
     if not options.desktopRunning:
@@ -1455,12 +1440,6 @@ def main():
         if window and not orca_state.locusOfFocus:
             setLocusOfFocus(None, window)
 
-    # Check to see if the user wants the configuration GUI. It's
-    # done here so that the user's existing preferences can be used
-    # to set the initial GUI state.
-    if options.setupRequested and options.showGUI:
-        showPreferencesGUI()
-
     try:
         start(pyatspi.Registry) # waits until we stop the registry
     except: