gnome-session r4660 - in trunk: . data

[lucasr svn gnome org]

Author: lucasr
Date: Mon Apr 21 19:23:44 2008
New Revision: 4660
URL: http://svn.gnome.org/viewvc/gnome-session?rev=4660&view=rev

Log:
2008-04-21  Lucas Rocha  <lucasr gnome org>

	* data/Makefile.am, data/nautilus.desktop,
	data/gnome-settings-daemon.desktop: don't install .desktop files for
	nautilus and gnome-settings-daemon because gnome-session looks for
	those in their origin paths now.


Removed:
   trunk/data/gnome-settings-daemon.desktop
   trunk/data/nautilus.desktop
Modified:
   trunk/ChangeLog
   trunk/data/Makefile.am

Modified: trunk/data/Makefile.am
==============================================================================
--- trunk/data/Makefile.am	(original)
+++ trunk/data/Makefile.am	Mon Apr 21 19:23:44 2008
@@ -1,10 +1,5 @@
 SUBDIRS = icons
 
-default_sessiondir = $(datadir)/gnome/default-session
-default_session_DATA =				\
-	gnome-settings-daemon.desktop		\
-	nautilus.desktop
-
 @INTLTOOL_DESKTOP_RULE@
 
 xsessiondir = $(datadir)/xsessions
@@ -35,8 +30,7 @@
 	README					\
 	gnome-wm				\
 	$(xsession_in_files)			\
-	$(schemas_in_files)			\
-	$(default_session_DATA)
+	$(schemas_in_files)
 
 DISTCLEANFILES =				\
 	$(schemas_DATA)				\