From 66256eeb2a23272028ae4d5f1703ac86f5d051c6 Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode@redhat.com>
Date: Oct 04 2010 18:17:14 +0000
Subject: Switch back to orbit stack by default


The dbus stack apparently isn't working too well:

http://lists.fedoraproject.org/pipermail/desktop/2010-October/006568.html

    Regarding orca not reading the contents of windows, etc (what leads to
    orca only announcing key presses) I have a sort of solution.

    Before saying what I needed to do, this fix will make orca still use
    at-spi over corba. I know that the intention was to have fedora 14 use
    at-spi over dbus but as time is running out, I have been unable to find
    a solution using at-spi over dbus and there shouldn't be any difference
    to the user at the moment (if anything at-spi-corba is more likely to be
    reliable as at-spi-dbus is in early days), it may be worth considering
    this so we at least have a working orca.

This commit just changes the default value in the gconf schema.

---

diff --git a/at-spi.spec b/at-spi.spec
index 4b82c80..ceb08a5 100644
--- a/at-spi.spec
+++ b/at-spi.spec
@@ -10,7 +10,7 @@
 Summary: Assistive Technology Service Provider Interface
 Name: at-spi
 Version: 1.32.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 URL: http://developer.gnome.org/projects/gap/
 #VCS: git:git://git.gnome.org/at-spi
 Source0: http://download.gnome.org/sources/at-spi/1.32/%{name}-%{version}.tar.bz2
@@ -49,6 +49,9 @@ BuildRequires: automake, autoconf, libtool, intltool
 # http://bugzilla.gnome.org/show_bug.cgi?id=548782
 Patch0: evo-crash.patch
 
+# http://lists.fedoraproject.org/pipermail/desktop/2010-October/006568.html
+Patch1: use-orbit-stack.patch
+
 %description
 at-spi allows assistive technologies to access GTK-based
 applications. Essentially it exposes the internals of applications for
@@ -85,6 +88,7 @@ This package contains Python bindings allowing to use at-spi in Python programs.
 %prep
 %setup -q
 %patch0 -p1 -b .evo-crash
+%patch1 -p1 -b .use-orbit-stack
 
 %build
 %configure --disable-gtk-doc --disable-static --enable-relocate
@@ -140,6 +144,10 @@ mv $RPM_BUILD_ROOT%{_datadir}/doc/%{name}-%{version} \
 
 
 %changelog
+* Mon Oct 04 2010 Ray Strode <rstrode@redhat.com> 1.32.0-2
+- Switch back to orbit stack by default
+http://lists.fedoraproject.org/pipermail/desktop/2010-October/006568.html
+
 * Thu Sep 30 2010 Matthias Clasen <mclasen@redhat.com> - 1.32.0-1
 - Update to 2.32.0
 
diff --git a/use-orbit-stack.patch b/use-orbit-stack.patch
new file mode 100644
index 0000000..7e58767
--- /dev/null
+++ b/use-orbit-stack.patch
@@ -0,0 +1,12 @@
+diff -up at-spi-1.32.0/at-spi.schemas.in.use-orbit-stack at-spi-1.32.0/at-spi.schemas.in
+--- at-spi-1.32.0/at-spi.schemas.in.use-orbit-stack	2010-10-04 14:15:43.691509987 -0400
++++ at-spi-1.32.0/at-spi.schemas.in	2010-10-04 14:15:45.963770826 -0400
+@@ -18,7 +18,7 @@ support.</long>
+       <applyto>/desktop/gnome/interface/at-spi-corba</applyto>
+       <owner>gnome</owner>
+       <type>bool</type>
+-      <default>false</default>
++      <default>true</default>
+       <locale name="C">
+         <short>Enable CORBA-based AT-SPI infrastructure</short>
+         <long>In combination with /desktop/gnome/interface/accessibility, this key is needed to enable the CORBA-based AT-SPI infrastructure if the CORBA-based AT-SPI infrastructure has been relocated.  It is ignored if the CORBA-based AT-SPI infrastructure has not been relocated.</long>