diff options
| author | Vincent Untz <vuntz@gnome.org> | 2008-09-08 20:13:33 +0000 |
|---|---|---|
| committer | Thomas James Alexander Thurman <tthurman@src.gnome.org> | 2008-09-08 20:13:33 +0000 |
| commit | 74148cb1eff0531233c7b92a98e4b8155acccb90 (patch) | |
| tree | 0abc25fb54671d8688b5ac718888223e1fee5349 | |
| parent | 989c81384715395fd34d4f7097a1de13db1359ef (diff) | |
| download | metacity-74148cb1eff0531233c7b92a98e4b8155acccb90.tar.gz | |
Desktop file installed in both places.
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
svn path=/branches/gnome-2-24/; revision=3867
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | src/Makefile.am | 7 | ||||
| -rw-r--r-- | src/metacity-wm.desktop.in | 21 |
3 files changed, 34 insertions, 1 deletions
@@ -1,3 +1,10 @@ +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 + 2008-09-03 Thomas Thurman <tthurman@gnome.org> * configure.in: Post-release bump to 2.23.610. diff --git a/src/Makefile.am b/src/Makefile.am index 194554ee..cc10f784 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -154,12 +154,17 @@ testboxes_LDADD= @METACITY_LIBS@ 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 diff --git a/src/metacity-wm.desktop.in b/src/metacity-wm.desktop.in new file mode 100644 index 00000000..91b81246 --- /dev/null +++ b/src/metacity-wm.desktop.in @@ -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 + |