From cc03e21cc35dca6dabe711fb7b3997c354fa3cbb Mon Sep 17 00:00:00 2001
From: Li Yuan <li.yuan@sun.com>
Date: Mon, 11 Jan 2010 16:48:13 +0800
Subject: [PATCH] Make at-spi-dbus-bus managed by gnome-session

---
 bus/Makefile.am                |    9 +++++++--
 bus/at-spi-dbus-bus.desktop    |    7 -------
 bus/at-spi-dbus-bus.desktop.in |    7 +++++++
 3 files changed, 14 insertions(+), 9 deletions(-)
 delete mode 100644 bus/at-spi-dbus-bus.desktop
 create mode 100644 bus/at-spi-dbus-bus.desktop.in

diff --git a/bus/Makefile.am b/bus/Makefile.am
index e5b6fab..39254fa 100644
--- a/bus/Makefile.am
+++ b/bus/Makefile.am
@@ -7,8 +7,13 @@ atspidbus_SCRIPTS=\
 	at-spi-dbus-bus
 
 default_sessiondir = $(sysconfdir)/xdg/autostart
-default_session_DATA = at-spi-dbus-bus.desktop
+default_session_in_files = at-spi-dbus-bus.desktop.in
+default_session_DATA = $(default_session_in_files:.desktop.in=.desktop)
+
+%.desktop: %.desktop.in Makefile.am
+	sed -e "s,\@atspibusdir\@,$(bindir)," \
+	< $< > $@
 
 EXTRA_DIST= \
             accessibility.conf \
-            at-spi-dbus-bus.desktop
+            at-spi-dbus-bus.desktop.in
diff --git a/bus/at-spi-dbus-bus.desktop b/bus/at-spi-dbus-bus.desktop
deleted file mode 100644
index b5f8622..0000000
--- a/bus/at-spi-dbus-bus.desktop
+++ /dev/null
@@ -1,7 +0,0 @@
-[Desktop Entry]
-Type=Application
-_Name=AT SPI D-Bus Bus
-Exec=at-spi-dbus-bus
-OnlyShowIn=GNOME;
-NoDisplay=true
-AutostartCondition=GNOME /desktop/gnome/interface/accessibility
diff --git a/bus/at-spi-dbus-bus.desktop.in b/bus/at-spi-dbus-bus.desktop.in
new file mode 100644
index 0000000..50df6c1
--- /dev/null
+++ b/bus/at-spi-dbus-bus.desktop.in
@@ -0,0 +1,7 @@
+[Desktop Entry]
+Type=Application
+Name=AT SPI D-Bus Bus
+Exec=@atspibusdir@/at-spi-dbus-bus
+OnlyShowIn=GNOME;
+NoDisplay=true
+AutostartCondition=GNOME /desktop/gnome/interface/accessibility
-- 
1.6.3.3