Use fd.o standard location for autostart desktop files. Fixes bug #481860

2007-10-01  Xavier Claessens  <xclaesse@gmail.com>

	* data/Makefile.am:
	* data/empathy.desktop.in.in: Use fd.o standard location for autostart
	desktop files. Fixes bug #481860 (Stephane Loeuillet).

svn path=/trunk/; revision=355

diff --git a/ChangeLog b/ChangeLog
index 8760c0b8f7512f7cd3450c17c337ae4ca7b27da2..177ebbdd71524fdd455b9b14ef63158e1046a526 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-10-01  Xavier Claessens  <xclaesse@gmail.com>
+
+       * data/Makefile.am:
+       * data/empathy.desktop.in.in: Use fd.o standard location for autostart
+       desktop files. Fixes bug #481860 (Stephane Loeuillet).
+
 2007-10-01  Xavier Claessens  <xclaesse@gmail.com>
 
        * configure.ac: Bump version to 0.15.

diff --git a/data/Makefile.am b/data/Makefile.am
index cddd3a39ba6eb0a2dc09eb54f845219047403586..b30b08d360731bf1ba69e06352221ed1260d205c 100644 (file)
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -21,7 +21,7 @@ update-icon-cache:
                echo "***   $(gtk_update_icon_cache)"; \
        fi
 
-autostartdir = $(datadir)/gnome/autostart
+autostartdir = $(sysconfdir)/xdg/autostart
 autostart_in_files = empathy.desktop.in
 autostart_DATA = $(autostart_in_files:.desktop.in=.desktop)
 @INTLTOOL_DESKTOP_RULE@

diff --git a/data/empathy.desktop.in.in b/data/empathy.desktop.in.in
index 9ccc34a436bd017444b5d2c68979a6611a0c9983..e5d56a278acd7f8bc64b5b820088065f04640af9 100644 (file)
--- a/data/empathy.desktop.in.in
+++ b/data/empathy.desktop.in.in
@@ -1,6 +1,5 @@
 [Desktop Entry]
 Version=1.0
-Encoding=UTF-8
 _Name=Empathy Instant Messenger
 _Comment=Send and receive instant messages
 Exec=empathy --no-connect