Install desktop files in both .../share/applications and

2008-09-12  Vincent Untz  <vuntz@gnome.org>

        Install desktop files in both
        .../share/applications and .../share/gnome/wm-properties.
        Copied in from the 2.23.x branch.  Closes #549479.

        * src/metacity-wm.desktop.in: new file
        * src/.cvsignore: include the above
        * src/Makefile.am: install the above


svn path=/trunk/; revision=3886
This commit is contained in:
Vincent Untz 2008-09-12 04:05:17 +00:00 committed by Thomas James Alexander Thurman
parent d4662bb6a2
commit 3109a67a71
4 changed files with 41 additions and 2 deletions

View File

@ -1,3 +1,13 @@
2008-09-12 Vincent Untz <vuntz@gnome.org>
Install desktop files in both
.../share/applications and .../share/gnome/wm-properties.
Copied in from the 2.23.x branch. Closes #549479.
* src/metacity-wm.desktop.in: new file
* src/.cvsignore: include the above
* src/Makefile.am: install the above
2008-09-06 Thomas Thurman <tthurman@gnome.org> 2008-09-06 Thomas Thurman <tthurman@gnome.org>
An attempt to keep all information about window bindings An attempt to keep all information about window bindings

View File

@ -9,6 +9,7 @@ testboxes
testgradient testgradient
inlinepixbufs.h inlinepixbufs.h
metacity.desktop metacity.desktop
metacity-wm.desktop
metacity.schemas metacity.schemas
libmetacity-private.pc libmetacity-private.pc
testasyncgetprop testasyncgetprop

View File

@ -154,12 +154,17 @@ testboxes_LDADD= @METACITY_LIBS@
testgradient_LDADD= @METACITY_LIBS@ testgradient_LDADD= @METACITY_LIBS@
testasyncgetprop_LDADD= @METACITY_LIBS@ testasyncgetprop_LDADD= @METACITY_LIBS@
@INTLTOOL_DESKTOP_RULE@
desktopfilesdir=$(datadir)/applications desktopfilesdir=$(datadir)/applications
desktopfiles_in_files=metacity.desktop.in desktopfiles_in_files=metacity.desktop.in
desktopfiles_files=$(desktopfiles_in_files:.desktop.in=.desktop) desktopfiles_files=$(desktopfiles_in_files:.desktop.in=.desktop)
desktopfiles_DATA = $(desktopfiles_files) 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@ schemadir = @GCONF_SCHEMA_FILE_DIR@
schema_in_files = metacity.schemas.in schema_in_files = metacity.schemas.in
@ -186,7 +191,7 @@ VARIABLES=stock_maximize_data $(srcdir)/stock_maximize.png \
stock_delete_data $(srcdir)/stock_delete.png stock_delete_data $(srcdir)/stock_delete.png
BUILT_SOURCES = inlinepixbufs.h BUILT_SOURCES = inlinepixbufs.h
CLEANFILES = inlinepixbufs.h metacity.desktop metacity.schemas 50-metacity-desktop-key.xml 50-metacity-key.xml CLEANFILES = inlinepixbufs.h metacity.desktop metacity-wm.desktop metacity.schemas 50-metacity-desktop-key.xml 50-metacity-key.xml
inlinepixbufs.h: $(IMAGES) inlinepixbufs.h: $(IMAGES)
$(GDK_PIXBUF_CSOURCE) --raw --build-list $(VARIABLES) >$(srcdir)/inlinepixbufs.h $(GDK_PIXBUF_CSOURCE) --raw --build-list $(VARIABLES) >$(srcdir)/inlinepixbufs.h
@ -196,8 +201,10 @@ pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = libmetacity-private.pc pkgconfig_DATA = libmetacity-private.pc
EXTRA_DIST=$(desktopfiles_files) \ EXTRA_DIST=$(desktopfiles_files) \
$(wmproperties_files) \
$(IMAGES) $(schema_DATA) \ $(IMAGES) $(schema_DATA) \
$(desktopfiles_in_files) \ $(desktopfiles_in_files) \
$(wmproperties_in_files) \
$(schema_in_files) \ $(schema_in_files) \
$(xml_in_files) \ $(xml_in_files) \
libmetacity-private.pc.in libmetacity-private.pc.in

View File

@ -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