summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Thurman <tthurman@gnome.org>2008-09-02 18:43:13 +0000
committerThomas James Alexander Thurman <tthurman@src.gnome.org>2008-09-02 18:43:13 +0000
commitc3ab0d90815026017b00e803a382e0f93b3df8f1 (patch)
treeb559610462e526300829a399d2830c88aaee0069
parent41cc6d4ad518cba41dae7488d3df96b50eda1217 (diff)
downloadmetacity-c3ab0d90815026017b00e803a382e0f93b3df8f1.tar.gz
Desktop file moved, according to policy change. Closes #549479.
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 svn path=/branches/gnome-2-24/; revision=3845
-rw-r--r--ChangeLog7
-rw-r--r--src/Makefile.am2
-rw-r--r--src/metacity.desktop.in1
3 files changed, 9 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index a5b1d71a..a69efb3c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+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
+
2008-08-20 Baptiste Mille-Mathias <baptiste.millemathias@gmail.com>
* src/default_icon.png: updated to a tango styled pixmap
diff --git a/src/Makefile.am b/src/Makefile.am
index 5f45a6fd..194554ee 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -154,7 +154,7 @@ testboxes_LDADD= @METACITY_LIBS@
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)
diff --git a/src/metacity.desktop.in b/src/metacity.desktop.in
index 47045f01..c9bb0bf8 100644
--- a/src/metacity.desktop.in
+++ b/src/metacity.desktop.in
@@ -3,6 +3,7 @@ Type=Application
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