r33658 - in /desktop/unstable/gnome-orca/debian: changelog patches/01_orca_setup_without_desktop.patch patches/series

[jordi at users.alioth.debian.org]

Author: jordi
Date: Wed Mar 28 09:43:56 2012
New Revision: 33658

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=33658
Log:
Add orca_setup_without_desktop.patch, cherripicked from git, to fix
regression on the text mode configuration when running outside a
desktop session.

Added:
    desktop/unstable/gnome-orca/debian/patches/01_orca_setup_without_desktop.patch
Modified:
    desktop/unstable/gnome-orca/debian/changelog
    desktop/unstable/gnome-orca/debian/patches/series

Modified: desktop/unstable/gnome-orca/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-orca/debian/changelog?rev=33658&op=diff
==============================================================================
--- desktop/unstable/gnome-orca/debian/changelog [utf-8] (original)
+++ desktop/unstable/gnome-orca/debian/changelog [utf-8] Wed Mar 28 09:43:56 2012
@@ -1,3 +1,11 @@
+gnome-orca (3.4.0-2) UNRELEASED; urgency=low
+
+  * Add orca_setup_without_desktop.patch, cherripicked from git, to fix
+    regression on the text mode configuration when running outside a
+    desktop session.
+
+ -- Jordi Mallach <jordi at debian.org>  Mon, 26 Mar 2012 22:36:30 +0200
+
 gnome-orca (3.4.0-1) unstable; urgency=low
 
   * New upstream release.

Added: desktop/unstable/gnome-orca/debian/patches/01_orca_setup_without_desktop.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-orca/debian/patches/01_orca_setup_without_desktop.patch?rev=33658&op=file
==============================================================================
--- desktop/unstable/gnome-orca/debian/patches/01_orca_setup_without_desktop.patch (added)
+++ desktop/unstable/gnome-orca/debian/patches/01_orca_setup_without_desktop.patch [utf-8] Wed Mar 28 09:43:56 2012
@@ -1,0 +1,58 @@
+From ce7655ffbd606a67bccdb74d430e222761032507 Mon Sep 17 00:00:00 2001
+From: Joanmarie Diggs <jdiggs at igalia.com>
+Date: Wed, 28 Mar 2012 01:23:17 +0000
+Subject: Ensure 'orca -t' works even without a Desktop
+
+---
+diff --git a/src/orca/settings_manager.py b/src/orca/settings_manager.py
+index edd25f4..2876915 100644
+--- a/src/orca/settings_manager.py
++++ b/src/orca/settings_manager.py
+@@ -39,11 +39,14 @@ from keybindings import KeyBinding
+ import settings
+ import pronunciation_dict
+ 
+-_dbusLoop = DBusGMainLoop()
+-_bus = dbus.SessionBus(mainloop=_dbusLoop)
+-_proxy = _bus.get_object("org.a11y.Bus", "/org/a11y/bus")
+-_desktopProps = \
+-    dbus.Interface(_proxy, dbus_interface='org.freedesktop.DBus.Properties')
++try:
++    _dbusLoop = DBusGMainLoop()
++    _bus = dbus.SessionBus(mainloop=_dbusLoop)
++    _proxy = _bus.get_object("org.a11y.Bus", "/org/a11y/bus")
++    _desktopProps = \
++        dbus.Interface(_proxy, dbus_interface='org.freedesktop.DBus.Properties')
++except:
++    _desktopProps = None
+ 
+ class SettingsManager(object):
+     """Settings backend manager. This class manages orca user's settings
+@@ -304,9 +307,15 @@ class SettingsManager(object):
+         return not alreadyEnabled
+ 
+     def isAccessibilityEnabled(self):
++        if not _desktopProps:
++            return False
++
+         return bool(_desktopProps.Get('org.a11y.Status', 'IsEnabled'))
+ 
+     def setAccessibility(self, enable):
++        if not _desktopProps:
++            return False
++
+         _desktopProps.Set('org.a11y.Status', 'IsEnabled', enable)
+         return True
+ 
+@@ -315,6 +324,9 @@ class SettingsManager(object):
+         this does not necessarily mean that Orca (or any other screen reader)
+         is running at the moment."""
+ 
++        if not _desktopProps:
++            return False
++
+         return bool(_desktopProps.Get('org.a11y.Status', 'ScreenReaderEnabled'))
+ 
+     def setStartingProfile(self, profile=None):
+--
+cgit v0.9.0.2

Modified: desktop/unstable/gnome-orca/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-orca/debian/patches/series?rev=33658&op=diff
==============================================================================
--- desktop/unstable/gnome-orca/debian/patches/series [utf-8] (original)
+++ desktop/unstable/gnome-orca/debian/patches/series [utf-8] Wed Mar 28 09:43:56 2012
@@ -1,1 +1,2 @@
+01_orca_setup_without_desktop.patch
 05_remove_pythonpath.patch