[orca/f15/master] Use GSettings to check whether toolkit accessibility is enabled, patch from Frederic Crozat

[Bastien Nocera]

commit 3b24e5ef48de0572939050607991b39119ce02d3
Author: Bastien Nocera <hadess at hadess.net>
Date:   Fri Mar 25 16:43:52 2011 +0000

    Use GSettings to check whether toolkit accessibility is enabled,
    patch from Frederic Crozat

 no-display.patch                  |   19 ----------------
 orca-1.0.0-add-stop-switch.patch  |   43 -------------------------------------
 orca-2.17.4-add-stop-switch.patch |   43 -------------------------------------
 orca-fix-signal-handling.patch    |   20 -----------------
 orca.spec                         |   11 ++++++++-
 use-gsettings.patch               |   15 +++++++++++++
 6 files changed, 25 insertions(+), 126 deletions(-)
---
diff --git a/orca.spec b/orca.spec
index a3adcda..7075763 100644
--- a/orca.spec
+++ b/orca.spec
@@ -16,7 +16,7 @@
 
 Name:           orca
 Version:        2.91.92
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Assistive technology for people with visual impairments
 
 Group:          User Interface/Desktops
@@ -60,6 +60,10 @@ Requires:       gnome-speech
 
 Requires:       speech-dispatcher
 
+# Patch from release-team, will be redone for inclusion
+# in upstream Orca
+Patch0: use-gsettings.patch
+
 %description
 Orca is a flexible, extensible, and powerful assistive technology for people
 with visual impairments. Using various combinations of speech synthesis,
@@ -68,6 +72,7 @@ toolkits that support AT-SPI (e.g. the GNOME desktop).
 
 %prep
 %setup -q
+%patch0 -p1 -b .use-gsettings
 
 %build
 %configure
@@ -109,6 +114,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 
 %changelog
+* Fri Mar 25 2011 Bastien Nocera <bnocera at redhat.com> 2.91.92-2
+- Use GSettings to check whether toolkit accessibility is enabled,
+  patch from Frederic Crozat
+
 * Tue Mar 22 2011 Matthias Clasen <mclasen at redhat.com> 2.91.92-1
 - Update to 2.91.92
 
diff --git a/use-gsettings.patch b/use-gsettings.patch
new file mode 100644
index 0000000..b7393b5
--- /dev/null
+++ b/use-gsettings.patch
@@ -0,0 +1,15 @@
+Index: orca-2.91.92/src/orca/orca.in
+===================================================================
+--- orca-2.91.92.orig/src/orca/orca.in
++++ orca-2.91.92/src/orca/orca.in
+@@ -131,8 +131,8 @@ runOrca()
+ # all set and we don't need to muck around.
+ #
+ if [ "x$LOGNAME" != "xgdm" ] ; then
+-    ACCESSIBILITY_ENABLED=`gconftool-2 \
+-        --get /desktop/gnome/interface/accessibility`
++    ACCESSIBILITY_ENABLED=`gsettings \
++        get org.gnome.desktop.interface toolkit-accessibility`
+     if [ "x$ACCESSIBILITY_ENABLED" != "xtrue" ] ; then
+         # Because we will be running Orca in text-setup mode, we want to
+         # make sure it is run in a terminal window.  If we're already in