Do not autostart with session. Fixes bug #525039 (Frederic Peters).

svn path=/trunk/; revision=928

diff --git a/data/Makefile.am b/data/Makefile.am
index a2f3285342eec0bd08bbb2861f5dad9c03bb89e6..bc225fc34a39aa361f7fa27b3d401ec16ffa5537 100644 (file)
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -17,9 +17,9 @@ profile_DATA =                                \
        sipphone.profile                \
        groupwise.profile
 
-autostartdir = $(sysconfdir)/xdg/autostart
-autostart_in_files = empathy.desktop.in
-autostart_DATA = $(autostart_in_files:.desktop.in=.desktop)
+desktopdir = $(datadir)/applications
+desktop_in_files = empathy.desktop.in
+desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
 @INTLTOOL_DESKTOP_RULE@
 
 schemasdir      = $(GCONF_SCHEMA_FILE_DIR)
@@ -40,12 +40,12 @@ endif
 
 EXTRA_DIST =                           \
        $(profile_DATA)                 \
-       $(autostart_in_files)           \
-       $(autostart_DATA)               \
+       $(desktop_in_files)             \
+       $(desktop_DATA)         \
        $(schemas_in_files)             \
        $(schemas_DATA)
 
 DISTCLEANFILES =                       \
-       $(autostart_DATA)               \
+       $(desktop_DATA)         \
        $(schemas_DATA)