[at-spi] Back out parallel fix for bgo#607077 - magic to detect whether to use D-Bus version or not can be br



commit 2ba2d1941ec03239fd11e40c077c35908788b636
Author: Willie Walker <william walker sun com>
Date:   Tue Jan 19 11:43:38 2010 -0500

    Back out parallel fix for bgo#607077 - magic to detect whether to use D-Bus version or not can be broken
    The at-spi-registryd sets the GTK_PATH appropriately if needed, and the at-spi-registryd
    is started by at-spi-registryd.desktop.  So, a new *.desktop file is not needed to set
    the GTK_PATH environment variable.

 atk-bridge/Makefile.am           |   12 ------------
 atk-bridge/atk-bridge.desktop.in |    8 --------
 2 files changed, 0 insertions(+), 20 deletions(-)
---
diff --git a/atk-bridge/Makefile.am b/atk-bridge/Makefile.am
index 88babec..8b68cee 100644
--- a/atk-bridge/Makefile.am
+++ b/atk-bridge/Makefile.am
@@ -39,15 +39,3 @@ libatk_bridge_la_LDFLAGS =  	\
 libatk_bridge_la_LIBADD = \
 	$(top_builddir)/libspi/libspi.la	\
 	$(ATK_BRIDGE_LIBS) $(X_LIBS)
-
-if RELOCATE
-gnomeautostartdir = $(datadir)/gnome/autostart
-gnomeautostart_DATA = atk-bridge.desktop
-endif
-
-gtkpathdir = $(moduledir)/..
-EXTRA_DIST = atk-bridge.desktop.in
-CLEANFILES = atk-bridge.desktop
-%.desktop: %.desktop.in Makefile.am
-	sed -e "s,\ gtkpathdir\@,$(gtkpathdir)," \
-	< $< > $@



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]