empathy r928 - trunk/data

[xclaesse svn gnome org]

Author: xclaesse
Date: Fri Apr 11 16:09:13 2008
New Revision: 928
URL: http://svn.gnome.org/viewvc/empathy?rev=928&view=rev

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


Modified:
   trunk/data/Makefile.am

Modified: trunk/data/Makefile.am
==============================================================================
--- trunk/data/Makefile.am	(original)
+++ trunk/data/Makefile.am	Fri Apr 11 16:09:13 2008
@@ -17,9 +17,9 @@
 	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 @@
 
 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)