From: Xavier Claessens <xclaesse@src.gnome.org>
Date: Fri, 11 Apr 2008 15:09:13 +0000 (+0000)
Subject: Do not autostart with session. Fixes bug #525039 (Frederic Peters).
X-Git-Url: https://git.0d.be/?p=empathy.git;a=commitdiff_plain;h=a961af8441644304c3046556ad30ab724f2a4e0a

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 a2f32853..bc225fc3 100644
--- 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)