metacity r3867 - in branches/gnome-2-24: . src

[tthurman svn gnome org]

Author: tthurman
Date: Mon Sep  8 20:13:33 2008
New Revision: 3867
URL: http://svn.gnome.org/viewvc/metacity?rev=3867&view=rev

Log:
2008-09-08  Vincent Untz  <vuntz gnome org>

        Desktop file installed in both places.

        * src/Makefile.am: install both kinds of desktop file
        * src/metacity-wm.desktop.in: desktop file for gnome/wm-properties



Added:
   branches/gnome-2-24/src/metacity-wm.desktop.in
Modified:
   branches/gnome-2-24/ChangeLog
   branches/gnome-2-24/src/Makefile.am

Modified: branches/gnome-2-24/src/Makefile.am
==============================================================================
--- branches/gnome-2-24/src/Makefile.am	(original)
+++ branches/gnome-2-24/src/Makefile.am	Mon Sep  8 20:13:33 2008
@@ -154,12 +154,17 @@
 testgradient_LDADD= @METACITY_LIBS@
 testasyncgetprop_LDADD= @METACITY_LIBS@
 
+ INTLTOOL_DESKTOP_RULE@
+
 desktopfilesdir=$(datadir)/applications
 desktopfiles_in_files=metacity.desktop.in
 desktopfiles_files=$(desktopfiles_in_files:.desktop.in=.desktop)
 desktopfiles_DATA = $(desktopfiles_files)
 
- INTLTOOL_DESKTOP_RULE@
+wmpropertiesdir=$(datadir)/gnome/wm-properties
+wmproperties_in_files=metacity-wm.desktop.in
+wmproperties_files=$(wmproperties_in_files:.desktop.in=.desktop)
+wmproperties_DATA = $(wmproperties_files)
 
 schemadir   = @GCONF_SCHEMA_FILE_DIR@
 schema_in_files = metacity.schemas.in

Added: branches/gnome-2-24/src/metacity-wm.desktop.in
==============================================================================
--- (empty file)
+++ branches/gnome-2-24/src/metacity-wm.desktop.in	Mon Sep  8 20:13:33 2008
@@ -0,0 +1,21 @@
+[Desktop Entry]
+Type=Application
+Encoding=UTF-8
+_Name=Metacity
+Exec=metacity
+# name of loadable control center module
+X-GNOME-WMSettingsModule=metacity
+# name we put on the WM spec check window
+X-GNOME-WMName=Metacity
+# back compat only 
+X-GnomeWMSettingsLibrary=metacity
+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
+