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

[tthurman svn gnome org]

Author: tthurman
Date: Tue Sep  2 18:43:13 2008
New Revision: 3845
URL: http://svn.gnome.org/viewvc/metacity?rev=3845&view=rev

Log:
2008-09-02  Thomas Thurman  <tthurman gnome org>

        Desktop file moved, according to policy change.  Closes #549479.

        * src/metacity.desktop.in: Don't display the desktop file
        * src/Makefile.am: Desktop file goes in apps directory



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

Modified: branches/gnome-2-24/src/Makefile.am
==============================================================================
--- branches/gnome-2-24/src/Makefile.am	(original)
+++ branches/gnome-2-24/src/Makefile.am	Tue Sep  2 18:43:13 2008
@@ -154,7 +154,7 @@
 testgradient_LDADD= @METACITY_LIBS@
 testasyncgetprop_LDADD= @METACITY_LIBS@
 
-desktopfilesdir=$(datadir)/gnome/wm-properties
+desktopfilesdir=$(datadir)/applications
 desktopfiles_in_files=metacity.desktop.in
 desktopfiles_files=$(desktopfiles_in_files:.desktop.in=.desktop)
 desktopfiles_DATA = $(desktopfiles_files)

Modified: branches/gnome-2-24/src/metacity.desktop.in
==============================================================================
--- branches/gnome-2-24/src/metacity.desktop.in	(original)
+++ branches/gnome-2-24/src/metacity.desktop.in	Tue Sep  2 18:43:13 2008
@@ -3,6 +3,7 @@
 Encoding=UTF-8
 _Name=Metacity
 Exec=metacity
+NoDisplay=true
 # name of loadable control center module
 X-GNOME-WMSettingsModule=metacity
 # name we put on the WM spec check window