at-spi r1066 - trunk

[matthiasc svn gnome org]

Author: matthiasc
Date: Fri Sep 19 13:41:51 2008
New Revision: 1066
URL: http://svn.gnome.org/viewvc/at-spi?rev=1066&view=rev

Log:
2008-09-19  Matthias Clasen <mclasen redhat com>

        Bug 535827 Automatically load gail:atk-bridge if AT_SPI_IOR is set
        on root window

        * at-spi.schemas.in: Add a GConf schema for a key that makes
        gnome-settings-daemon add the a11y modules to the gtk-modules
        xsetting.

        * configure.in:
        * Makefile.am: Necessary glue to install the schemas file.




Added:
   trunk/at-spi.schemas.in
Modified:
   trunk/ChangeLog
   trunk/Makefile.am
   trunk/configure.in

Modified: trunk/Makefile.am
==============================================================================
--- trunk/Makefile.am	(original)
+++ trunk/Makefile.am	Fri Sep 19 13:41:51 2008
@@ -5,10 +5,30 @@
 
 DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc
 
+schemasdir       = $(GCONF_SCHEMA_FILE_DIR)
+schemas_in_files = at-spi.schemas.in
+schemas_DATA     = $(schemas_in_files:.schemas.in=.schemas)
+ INTLTOOL_SCHEMAS_RULE@
+
+if GCONF_SCHEMAS_INSTALL
+install-data-local:
+                if test -z "$(DESTDIR)" ; then \
+                        for p in $(schemas_DATA) ; do \
+                                GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(top_builddir)/data/$$p ; \
+                        done \
+                fi
+else
+install-data-local:
+endif
+
 EXTRA_DIST = \
+	$(schemas_in_files) \
 	MAINTAINERS \
 	cspi-1.0.pc.in \
 	cspi-1.0-uninstalled.pc.in \
 	libloginhelper-1.0.pc.in \
 	libspi-1.0.pc.in \
 	libspi-1.0-uninstalled.pc.in
+
+CLEANFILES = \
+	$(schemas_DATA)

Added: trunk/at-spi.schemas.in
==============================================================================
--- (empty file)
+++ trunk/at-spi.schemas.in	Fri Sep 19 13:41:51 2008
@@ -0,0 +1,17 @@
+<?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>
+  </schemalist>
+</gconfschemafile>

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Fri Sep 19 13:41:51 2008
@@ -45,6 +45,10 @@
 AC_PROG_INSTALL
 AC_ISC_POSIX
 
+dnl GConf checks
+AC_PATH_PROG(GCONFTOOL, gconftool-2)
+AM_GCONF_SOURCE_2
+
 # Check for Python
 
 AM_PATH_PYTHON(2.4)