BGO#641869: Remove --enable-relocate and associated autostart file and schema

diff --git a/Makefile.am b/Makefile.am
index da05db4..8142b2d 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,30 +1,8 @@
 SUBDIRS=dbind droute common atk-adaptor po schemas
 
-schemas_in_files = at-spi2.schemas.in
-if RELOCATE
-schemasdir       = $(GCONF_SCHEMA_FILE_DIR)
-schemas_DATA     = $(schemas_in_files:.schemas.in=.schemas)
-@INTLTOOL_SCHEMAS_RULE@
-endif
-
 gtk_modulesdir = $(libdir)/gnome-settings-daemon-3.0/gtk-modules/
 gtk_modules_DATA = at-spi2-atk.desktop
 
-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)/$$p ; \
-                       done \
-               fi
-else
-install-data-local:
-endif
-
 EXTRA_DIST = \
-       $(schemas_in_files) \
        $(gtk_modules_DATA)
 
-
-CLEANFILES = \
-       $(schemas_DATA)

diff --git a/at-spi2.schemas.in b/at-spi2.schemas.in
deleted file mode 100644 (file)
index 56f5b78..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>false</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/atk-adaptor/Makefile.am b/atk-adaptor/Makefile.am
index 490461d..1e16a40 100644 (file)
--- a/atk-adaptor/Makefile.am
+++ b/atk-adaptor/Makefile.am
@@ -1,16 +1,3 @@
 SUBDIRS=adaptors gtk-2.0 gtk-3.0
 
-if RELOCATE
-    gtkpathdir = $(libdir)/gtk-2.0/modules/at-spi-dbus
-gnomeautostartdir = $(datadir)/gnome/autostart
-gnomeautostart_DATA = atk-bridge.desktop
-endif
-
-EXTRA_DIST = atk-bridge.desktop.in \
-       Makefile.include
-
-CLEANFILES = atk-bridge.desktop
-
-%.desktop: %.desktop.in Makefile.am
-       sed -e "s,\@gtkpathdir\@,$(gtkpathdir)," \
-       < $< > $@
+EXTRA_DIST = Makefile.include

diff --git a/atk-adaptor/atk-bridge.desktop.in b/atk-adaptor/atk-bridge.desktop.in
deleted file mode 100644 (file)
index 851d1ca..0000000
--- a/atk-adaptor/atk-bridge.desktop.in
+++ /dev/null
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=GNOME D-Bus atk-bridge locator
-Comment=Sets GTK_PATH for gnome-session to pick up D-Bus atk-bridge module
-Exec=dbus-send --session --dest="org.gnome.SessionManager" /org/gnome/SessionManager org.gnome.SessionManager.Setenv string:"GTK_PATH" string:"@gtkpathdir@"
-OnlyShowIn=GNOME;
-AutostartCondition=GNOME /desktop/gnome/interface/at-spi-dbus
-X-GNOME-Autostart-Phase=Initialization

diff --git a/atk-adaptor/gtk-2.0/Makefile.am b/atk-adaptor/gtk-2.0/Makefile.am
index 16f9f0f..7903fc6 100644 (file)
--- a/atk-adaptor/gtk-2.0/Makefile.am
+++ b/atk-adaptor/gtk-2.0/Makefile.am
@@ -1,7 +1,3 @@
-if RELOCATE
-    gtkmoduledir = $(libdir)/gtk-2.0/modules/at-spi-dbus/modules
-else
     gtkmoduledir = $(libdir)/gtk-2.0/modules
-endif
 
 include $(top_srcdir)/atk-adaptor/Makefile.include

diff --git a/atk-adaptor/gtk-3.0/Makefile.am b/atk-adaptor/gtk-3.0/Makefile.am
index cd3c5c9..a1a8480 100644 (file)
--- a/atk-adaptor/gtk-3.0/Makefile.am
+++ b/atk-adaptor/gtk-3.0/Makefile.am
@@ -1,7 +1,3 @@
-if RELOCATE
-    gtkmoduledir = $(libdir)/gtk-3.0/modules/at-spi-dbus/modules
-else
     gtkmoduledir = $(libdir)/gtk-3.0/modules
-endif
 
 include $(top_srcdir)/atk-adaptor/Makefile.include

diff --git a/configure.ac b/configure.ac
index e46ebd7..6561dec 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -71,16 +71,7 @@ else
 fi
 AC_SUBST(X_LIBS)
 
-AM_GCONF_SOURCE_2
-AC_ARG_ENABLE(relocate, [  --enable-relocate  Relocate to coexist with CORBA [default=no]], enable_relocate="$enableval", enable_relocate=no)
-if test x$enable_relocate = xyes ; then
-       AC_DEFINE(RELOCATE, , [Relocate to coexist with CORBA])
-       dnl GConf checks
-       AC_PATH_PROG(GCONFTOOL, gconftool-2)
-else
-       GLIB_GSETTINGS
-fi
-AM_CONDITIONAL(RELOCATE, test x$enable_relocate = xyes)
+GLIB_GSETTINGS
 
 AC_ARG_ENABLE(p2p, [  --enable-p2p  Allow peer-to-peer DBus connections [default=yes]], enable_p2p="$enableval", enable_p2p=yes)