orca r4660 - in trunk: . src/orca

[wwalker svn gnome org]

Author: wwalker
Date: Mon Mar 30 17:38:02 2009
New Revision: 4660
URL: http://svn.gnome.org/viewvc/orca?rev=4660&view=rev

Log:
Fix for bug #577330 - Detect whether speech dispatcher is installed or not


Modified:
   trunk/ChangeLog
   trunk/src/orca/speechdispatcherfactory.py

Modified: trunk/src/orca/speechdispatcherfactory.py
==============================================================================
--- trunk/src/orca/speechdispatcherfactory.py	(original)
+++ trunk/src/orca/speechdispatcherfactory.py	Mon Mar 30 17:38:02 2009
@@ -1,4 +1,4 @@
-# Copyright 2006, 2007, 2008 Brailcom, o.p.s.
+# Copyright 2006, 2007, 2008, 2009 Brailcom, o.p.s.
 #
 # Author: Tomas Cerha <cerha brailcom org>
 #
@@ -90,10 +90,12 @@
     getFactoryName = staticmethod(getFactoryName)
 
     def getSpeechServers():
+        servers = []
         default = SpeechServer._getSpeechServer(SpeechServer.DEFAULT_SERVER_ID)
-        servers = [default]
-        for module in default.list_output_modules():
-            servers.append(SpeechServer._getSpeechServer(module))
+        if default is not None:
+            servers.append(default)
+            for module in default.list_output_modules():
+                servers.append(SpeechServer._getSpeechServer(module))
         return servers
     getSpeechServers = staticmethod(getSpeechServers)