[orca] Remove the no-longer-relevant support for "no setup"

[Joanmarie Diggs <joanied src gnome org>]

commit 2e5dfbe5aaf67c395e5e041056e4ada47789402b
Author: Joanmarie Diggs <jdiggs igalia com>
Date:   Sat May 12 02:27:54 2012 -0400

    Remove the no-longer-relevant support for "no setup"
    
    (This option bypasses Orca's automatic/forced setup when no saved
    settings can be found. Orca no longer has an automatic/forced setup,
    hence there is no longer anything to bypass in this regard.)

 docs/man/orca.1           |    8 --------
 help/C/introduction.page  |    5 -----
 orca-autostart.desktop.in |    2 +-
 src/orca/orca.py          |   17 +++--------------
 4 files changed, 4 insertions(+), 28 deletions(-)
---
diff --git a/docs/man/orca.1 b/docs/man/orca.1
index 31eb9f8..b285705 100644
--- a/docs/man/orca.1
+++ b/docs/man/orca.1
@@ -50,14 +50,6 @@ When starting
 .BR orca ,
 initiate the text-based configuration.
 .TP
-.B \-n, --no-setup
-When starting
-.BR orca ,
-force the application to be started without configuration, even though
-it might have needed it. This is useful when starting
-.B orca
-via something like gdm.
-.TP
 .BI "\-u, --user-prefs-dir=" dirname
 When starting
 .BR orca ,
diff --git a/help/C/introduction.page b/help/C/introduction.page
index 3d85961..88c9a5c 100644
--- a/help/C/introduction.page
+++ b/help/C/introduction.page
@@ -106,11 +106,6 @@
         </item>
         <item>
           <p>
-            <cmd>-n</cmd>, <cmd>--no-setup</cmd>Skip set up of user preferences
-          </p>
-        </item>
-        <item>
-          <p>
             <cmd>-u</cmd>, <cmd>--user-prefs-dir=<em>dirname</em></cmd>:
             Use <em>dirname</em> as the alternate directory for user
             preferences
diff --git a/orca-autostart.desktop.in b/orca-autostart.desktop.in
index 3693e49..a0d6090 100644
--- a/orca-autostart.desktop.in
+++ b/orca-autostart.desktop.in
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=Application
 Name=Orca screen reader
-Exec=orca --no-setup --disable main-window,splash-window --enable speech,braille
+Exec=orca --disable main-window,splash-window --enable speech,braille
 NoDisplay=true
 AutostartCondition=GSettings org.gnome.desktop.a11y.applications screen-reader-enabled
 X-GNOME-AutoRestart=true
diff --git a/src/orca/orca.py b/src/orca/orca.py
index b1471e5..0a47d9c 100644
--- a/src/orca/orca.py
+++ b/src/orca/orca.py
@@ -312,14 +312,6 @@ parser.add_argument(
     help = _("Set up user preferences (text version)"))
 
 parser.add_argument(
-    "-n", "--no-setup", action = "store_true", dest = "bypassSetup",
-    # Translators: this is the description of the command line option
-    # '-n, --no-setup' that means that Orca will startup without setting up any
-    # user preferences.
-    #
-    help = _("Skip set up of user preferences"))
-
-parser.add_argument(
     "-u", "--user-prefs-dir", action = "store", dest = "userPrefsDir",
     # Translators: this is the description of the command line option
     # '-u, --user-prefs-dir=dirname' that allows you to specify an alternate
@@ -358,7 +350,7 @@ parser.add_argument(
     help = _("Replace a currently running Orca"))
 
 # temporary hack
-args = ''.join(sys.argv[1:])
+args = ' '.join(sys.argv[1:])
 options, invalidOpts = parser.parse_known_args(args.split(),
                                                namespace = Options())
 options.validate()
@@ -1420,7 +1412,7 @@ def main():
     if not _settingsManager.isAccessibilityEnabled():
         _settingsManager.setAccessibility(True)
 
-    if options.setupRequested and not (options.bypassSetup or options.showGUI):
+    if options.setupRequested and not options.showGUI:
         _showPreferencesConsole()
 
     if not options.desktopRunning:
@@ -1453,11 +1445,8 @@ def main():
     # 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 not options.bypassSetup and options.showGUI:
+    if options.setupRequested and options.showGUI:
         showPreferencesGUI()
-    elif options.bypassSetup:
-        loadUserSettings(skipReloadMessage=True)
-        _settingsManager.setFirstStart()
 
     try:
         start(pyatspi.Registry) # waits until we stop the registry