[orca] Fix for bug #627477 - Orca splash screen shouldn't be displayed in GDM

[Alejandro Leiva <aleiva src gnome org>]

commit 7762ac1addf783255aa9ba1774aeda78c14a9873
Author: Alejandro Leiva <aleiva emergya es>
Date:   Fri Aug 20 11:55:39 2010 +0200

    Fix for bug #627477 - Orca splash screen shouldn't be displayed in GDM

 src/orca/orca.py            |   16 +++++++++++++---
 src/orca/orca_gui_splash.py |   14 +++++++++++++-
 2 files changed, 26 insertions(+), 4 deletions(-)
---
diff --git a/src/orca/orca.py b/src/orca/orca.py
index c1cf17c..f151de4 100644
--- a/src/orca/orca.py
+++ b/src/orca/orca.py
@@ -1566,7 +1566,11 @@ def showSplashGUI(script=None, inputEvent=None):
                             globals(),
                             locals(),
                             [''])
-        module.showSplashUI()
+        if _commandLineSettings.get("showSplashWindow", True):
+            module.showSplashUI()
+        else:
+            module.hideSplashUI()
+
     except:
         debug.printException(debug.LEVEL_SEVERE)
 
@@ -1854,7 +1858,8 @@ def usage():
         + "braille" + "|" \
         + "braille-monitor" + "|" \
         + "magnifier" + "|" \
-        + "main-window" + "]",
+        + "main-window" + "|" \
+        + "splash-window" + "]",
 
     # Translators: if the user supplies an option via the '-e, --enable'
     # command line option, it will be automatically enabled as Orca is
@@ -1867,7 +1872,8 @@ def usage():
         + "braille" + "|" \
         + "braille-monitor" + "|" \
         + "magnifier" + "|" \
-        + "main-window" + "]",
+        + "main-window" + "|" \
+        + "splash-window" + "]",
 
     # Translators: if the user supplies an option via the '-d, --disable'
     # command line option, it will be automatically disabled as Orca is
@@ -2040,6 +2046,8 @@ def main():
                     _commandLineSettings["enableMagnifier"] = True
                 elif feature == "main-window":
                     _commandLineSettings["showMainWindow"] = True
+                elif feature == "splash-window":
+                    _commandLineSettings["showSplashWindow"] = True
                 else:
                     usage()
                     die(2)
@@ -2056,6 +2064,8 @@ def main():
                     _commandLineSettings["enableMagnifier"] = False
                 elif feature == "main-window":
                     _commandLineSettings["showMainWindow"] = False
+                elif feature == "splash-window":
+                    _commandLineSettings["showSplashWindow"] = False
                 else:
                     usage()
                     die(2)
diff --git a/src/orca/orca_gui_splash.py b/src/orca/orca_gui_splash.py
index 4a2aef8..153714c 100644
--- a/src/orca/orca_gui_splash.py
+++ b/src/orca/orca_gui_splash.py
@@ -90,7 +90,14 @@ class OrcaSplashGUI(orca_gtkbuilder.GtkBuilderWrapper):
         gobject.timeout_add(3000, splashScreen.hide)
 
         return splashScreen
-            
+
+    def hideGUI(self):
+        """Hide the Orca splash screen GUI. This assumes that the GUI has
+        already been created.
+        """
+
+        self.get_widget("splashWindow").hide()
+
 
 def showSplashUI():
     global OS
@@ -107,6 +114,11 @@ def showSplashUI():
 
     OS.showGUI()
 
+def hideSplashUI():
+    if OS:
+        OS.hideGUI()
+
+
 def main():
     locale.setlocale(locale.LC_ALL, '')