[orca] Fix for bug 673397 - Using flat review while in Unity Greeter makes Orca stop presenting screen cont



commit 89be976142e993a20647409b9915ce5cb8cbe46a
Author: Joanmarie Diggs <jdiggs igalia com>
Date:   Mon Apr 2 23:07:00 2012 -0400

    Fix for bug 673397 - Using flat review while in Unity Greeter makes Orca stop presenting screen contents

 src/orca/orca.py    |    3 +++
 src/orca/outline.py |    9 ++++++++-
 2 files changed, 11 insertions(+), 1 deletions(-)
---
diff --git a/src/orca/orca.py b/src/orca/orca.py
index a796cef..fd21290 100644
--- a/src/orca/orca.py
+++ b/src/orca/orca.py
@@ -61,6 +61,9 @@ try:
     #
     from gi.repository import Gtk
     from gi.repository import Gdk
+    # Note: This last import is here due to bgo #673396.
+    # See bgo#673397 for the rest of the story.
+    from gi.repository.GdkX11 import X11Screen
 except:
     pass
 
diff --git a/src/orca/outline.py b/src/orca/outline.py
index 864da66..da6bd14 100644
--- a/src/orca/outline.py
+++ b/src/orca/outline.py
@@ -36,6 +36,13 @@ display = Gdk.Display.get_default()
 screen = display.get_default_screen()
 screen_width = screen.get_width()
 screen_height = screen.get_height()
+try:
+    window_manager = screen.get_window_manager_name()
+except:
+    window_manager = None
+else:
+    if window_manager == 'unknown':
+        window_manager = None
 
 def _adjustToScreen(x, y, width, height):
     if x < 0:
@@ -194,7 +201,7 @@ def draw(x, y, width, height):
     be composed of multiple windows depending upon the
     settings.outlineStyle."""
 
-    if settings.outlineStyle == settings.OUTLINE_NONE:
+    if settings.outlineStyle == settings.OUTLINE_NONE or not window_manager:
         pass
     # Temporary solution for the fact that the flat review rectangle is now
     # solid. We are working on this, but it may or may not be done in time



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]