metacity r3669 - in trunk: . src

[tthurman svn gnome org]

Author: tthurman
Date: Sun Mar 30 00:01:18 2008
New Revision: 3669
URL: http://svn.gnome.org/viewvc/metacity?rev=3669&view=rev

Log:
2008-03-29  Lucas Rocha  <lucasr at mundo gmail com>

        * src/metacity.desktop.in, src/Makefile.am: make Metacity
        install its desktop files in the default session directory
        as required by the new gnome-session.  (Closes #525051.)



Modified:
   trunk/ChangeLog
   trunk/src/Makefile.am
   trunk/src/metacity.desktop.in

Modified: trunk/src/Makefile.am
==============================================================================
--- trunk/src/Makefile.am	(original)
+++ trunk/src/Makefile.am	Sun Mar 30 00:01:18 2008
@@ -149,6 +149,7 @@
 desktopfiles_in_files=metacity.desktop.in
 desktopfiles_files=$(desktopfiles_in_files:.desktop.in=.desktop)
 desktopfiles_DATA = $(desktopfiles_files)
+
 @INTLTOOL_DESKTOP_RULE@
 
 schemadir   = @GCONF_SCHEMA_FILE_DIR@
@@ -170,6 +171,14 @@
 install-data-local:
 endif
 
+sessiondir = $(datadir)/gnome/default-session;
+
+install-data-hook:
+	if test -z "$(sessiondir)" ; then \
+	       $(MKDIR_P) $(sessiondir) \
+	fi
+	$(LN_S) -f $(desktopfilesdir)/$(desktopfiles_DATA) $(sessiondir)
+
 IMAGES=default_icon.png stock_maximize.png stock_minimize.png stock_delete.png
 VARIABLES=default_icon_data $(srcdir)/default_icon.png \
           stock_maximize_data $(srcdir)/stock_maximize.png \

Modified: trunk/src/metacity.desktop.in
==============================================================================
--- trunk/src/metacity.desktop.in	(original)
+++ trunk/src/metacity.desktop.in	Sun Mar 30 00:01:18 2008
@@ -1,4 +1,5 @@
 [Desktop Entry]
+Type=Application
 Encoding=UTF-8
 _Name=Metacity
 Exec=metacity
@@ -11,6 +12,9 @@
 X-GNOME-Bugzilla-Bugzilla=GNOME
 X-GNOME-Bugzilla-Product=metacity
 X-GNOME-Bugzilla-Component=general
+X-GNOME-Autostart-Phase=WindowManager
+X-GNOME-Provides=windowmanager
+X-GNOME-Autostart-Notify=true
 
 [Window Manager]
 SessionManaged=true