orca r3803 - in trunk: . src/orca

[eitani svn gnome org]

Author: eitani
Date: Thu Apr  3 23:44:12 2008
New Revision: 3803
URL: http://svn.gnome.org/viewvc/orca?rev=3803&view=rev

Log:
* src/orca/orca.py:
  Fixed bug #525649 - Don't bomb when no DISPLAY is set.


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

Modified: trunk/src/orca/orca.py
==============================================================================
--- trunk/src/orca/orca.py	(original)
+++ trunk/src/orca/orca.py	Thu Apr  3 23:44:12 2008
@@ -41,6 +41,7 @@
     # the desktop is not running.
     #
     import gtk
+    import mouse_review
 except:
     pass
 
@@ -62,7 +63,6 @@
 import platform
 import settings
 import speech
-import mouse_review
 
 from input_event import BrailleEvent
 from input_event import KeyboardEvent
@@ -905,7 +905,10 @@
 
     # I'm not sure where else this should go. But it doesn't really look
     # right here.
-    mouse_review.mouse_reviewer.toggle(on=settings.enableMouseReview)
+    try:
+        mouse_review.mouse_reviewer.toggle(on=settings.enableMouseReview)
+    except NameError:
+        pass
 
     # We don't want the Caps_Lock modifier to act as a locking
     # modifier if it used as the Orca modifier key.  In addition, if