Remove schema

Setting atk-bridge-location can cause problems on multilib builds and
should now be unnecessary since atk-bridge is installed into the normal
library path. No other keys were present in the schema, so removing it.

diff --git a/Makefile.am b/Makefile.am
index da531c4..34dd6e6 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS=dbind droute atk-adaptor schemas
+SUBDIRS=dbind droute atk-adaptor
 
 gtk_modulesdir = $(libdir)/gnome-settings-daemon-3.0/gtk-modules/
 gtk_modules_DATA = at-spi2-atk.desktop

diff --git a/configure.ac b/configure.ac
index 08e9b59..0fdad14 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -108,7 +108,6 @@ AC_CONFIG_FILES([Makefile
                 atk-adaptor/Makefile
                 atk-adaptor/adaptors/Makefile
                 atk-adaptor/gtk-2.0/Makefile
-                 schemas/Makefile
                ])
 
 AC_OUTPUT

diff --git a/schemas/Makefile.am b/schemas/Makefile.am
deleted file mode 100644 (file)
index 116a81c..0000000
--- a/schemas/Makefile.am
+++ /dev/null
@@ -1,12 +0,0 @@
-gsettings_SCHEMAS = org.a11y.atspi.gschema.xml
-
-org.a11y.atspi.gschema.xml: org.a11y.atspi.gschema.xml.in Makefile
-       $(AM_V_GEN) sed -e "s|@libdir[@]|$(libdir)|" $< > $@
-
-CLEANFILES = org.a11y.atspi.gschema.xml
-
-@GSETTINGS_RULES@
-
-EXTRA_DIST = \
-       $(gsettings_SCHEMAS) \
-       $(patsubst %,%.in,$(gsettings_SCHEMAS))

diff --git a/schemas/org.a11y.atspi.gschema.xml.in b/schemas/org.a11y.atspi.gschema.xml.in
deleted file mode 100644 (file)
index 765870b..0000000
--- a/schemas/org.a11y.atspi.gschema.xml.in
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0"?>
-<schemalist>
-       <schema id="org.a11y.atspi" path="/org/a11y/atspi/">
-    <key name="atk-bridge-location" type="ay">
-      <default>b'@libdir@/gtk-3.0/modules/libatk-bridge.so'</default>
-      <summary>Atk-bridge location</summary>
-      <description>The path to the atk-bridge module; useful for non-GTK applications/toolkits that want to load it.</description>
-    </key>
-  </schema>
-</schemalist>