From 2fdee82e7206dd51f612a28e6722d9e01bc80c53 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alejandro=20Pi=C3=B1eiro?= <apinheiro@igalia.com>
Date: Wed, 16 Jun 2010 15:56:57 +0200
Subject: [PATCH] Added a new gconf property with the atk-bridge path

I needed to define a in.in file in order to change the @libdir@ var on
compile time.

This is just a rough draft, issues to solve

 * It requires some work on the name

 * As it is on the main Makefile.am it can't use the gtkmoduledir
   directory, so it recreates it again. It can create problems with
   the relocation thing.

 * Anyway, as right now there are two gtk related moduledirs (2.0 +
   3.0), we need to decide if we just use one of the existing, or
   create a shared directory to do that, something like
   at-spi-libdir=$libdir$/at-spi2/modules/, and install the module in
   three different places.

 * It requires a full description (short and long) as
   the traslation strings.
---
 Makefile.am           |    6 ++++++
 at-spi2.schemas.in    |   28 ----------------------------
 at-spi2.schemas.in.in |   39 +++++++++++++++++++++++++++++++++++++++
 3 files changed, 45 insertions(+), 28 deletions(-)
 delete mode 100644 at-spi2.schemas.in
 create mode 100644 at-spi2.schemas.in.in

diff --git a/Makefile.am b/Makefile.am
index 41f01c3..3848b9a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -5,6 +5,12 @@ schemas_in_files = at-spi2.schemas.in
 schemas_DATA     = $(schemas_in_files:.schemas.in=.schemas)
 @INTLTOOL_SCHEMAS_RULE@
 
+edit = sed -e 's,@libdir\@,$(libdir),g'
+
+at-spi2.schemas.in: Makefile at-spi2.schemas.in.in
+	rm -f at-spi2.schemas.in
+	$(edit) at-spi2.schemas.in.in > at-spi2.schemas.in
+
 if GCONF_SCHEMAS_INSTALL
 install-data-local:
                 if test -z "$(DESTDIR)" ; then \
diff --git a/at-spi2.schemas.in b/at-spi2.schemas.in
deleted file mode 100644
index 7872a47..0000000
--- a/at-spi2.schemas.in
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0"?>
-<gconfschemafile>
-  <schemalist>
-    <schema>
-      <key>/schemas/apps/gnome_settings_daemon/gtk-modules/gail:atk-bridge</key>
-      <applyto>/apps/gnome_settings_daemon/gtk-modules/gail:atk-bridge</applyto>
-      <owner>gnome</owner>
-      <type>string</type>
-      <default>/desktop/gnome/interface/accessibility</default>
-      <locale name="C">
-        <short>GTK+ modules for accessibility support</short>
-        <long>This key determines the GTK+ modules to load for accessibility
-support.</long>
-      </locale>
-    </schema>
-    <schema>
-      <key>/schemas/desktop/gnome/interface/at-spi-dbus</key>
-      <applyto>/desktop/gnome/interface/at-spi-dbus</applyto>
-      <owner>gnome</owner>
-      <type>bool</type>
-      <default>true</default>
-      <locale name="C">
-        <short>Enable DBus-based AT-SPI infrastructure</short>
-        <long>In combination with /desktop/gnome/interface/accessibility, this key is needed to enable the DBus-based AT-SPI infrastructure if the DBus-based AT-SPI infrastructure has been relocated.  It is ignored if the DBus-based AT-SPI infrastructure has not been relocated.</long>
-      </locale>
-    </schema>
-  </schemalist>
-</gconfschemafile>
diff --git a/at-spi2.schemas.in.in b/at-spi2.schemas.in.in
new file mode 100644
index 0000000..c863210
--- /dev/null
+++ b/at-spi2.schemas.in.in
@@ -0,0 +1,39 @@
+<?xml version="1.0"?>
+<gconfschemafile>
+  <schemalist>
+    <schema>
+      <key>/schemas/apps/gnome_settings_daemon/gtk-modules/gail:atk-bridge</key>
+      <applyto>/apps/gnome_settings_daemon/gtk-modules/gail:atk-bridge</applyto>
+      <owner>gnome</owner>
+      <type>string</type>
+      <default>/desktop/gnome/interface/accessibility</default>
+      <locale name="C">
+        <short>GTK+ modules for accessibility support</short>
+        <long>This key determines the GTK+ modules to load for accessibility
+support.</long>
+      </locale>
+    </schema>
+    <schema>
+      <key>/schemas/desktop/gnome/interface/at-spi-dbus</key>
+      <applyto>/desktop/gnome/interface/at-spi-dbus</applyto>
+      <owner>gnome</owner>
+      <type>bool</type>
+      <default>true</default>
+      <locale name="C">
+        <short>Enable DBus-based AT-SPI infrastructure</short>
+        <long>In combination with /desktop/gnome/interface/accessibility, this key is needed to enable the DBus-based AT-SPI infrastructure if the DBus-based AT-SPI infrastructure has been relocated.  It is ignored if the DBus-based AT-SPI infrastructure has not been relocated.</long>
+      </locale>
+    </schema>
+    <schema>
+      <key>/schemas/desktop/gnome/interface/atk-bridge-path</key>
+      <applyto>/gnome/interface/atk-bridge-path</applyto>
+      <owner>gnome</owner>
+      <type>string</type>
+      <default>@libdir@/gtk-2.0/modules</default>
+      <locale name="C">
+        <short>atk-bridge path</short>
+        <long>atk-bridge patch</long>
+      </locale>
+    </schema>
+  </schemalist>
+</gconfschemafile>
-- 
1.7.0.4