aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--data/Makefile.am2
-rw-r--r--data/empathy.desktop.in.in1
3 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 8760c0b8f..177ebbdd7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
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.
2007-10-01 Xavier Claessens <xclaesse@gmail.com>
diff --git a/data/Makefile.am b/data/Makefile.am
index cddd3a39b..b30b08d36 100644
--- 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 9ccc34a43..e5d56a278 100644
--- 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