isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-22 08:00:42 -05:00
Code Issues Packages Projects Releases Wiki Activity

make Metacity install its desktop files in the default session directory

Browse Source 
2008-03-29  Lucas Rocha  <lucasr.at.mundo@gmail.com>

        * src/metacity.desktop.in, src/Makefile.am: make Metacity
        install its desktop files in the default session directory
        as required by the new gnome-session.  (Closes #525051.)


svn path=/trunk/; revision=3669
This commit is contained in:
Lucas Rocha 2008-03-30 00:01:18 +00:00 committed by Thomas James Alexander Thurman
parent 6a586e8929
commit fb588c6075
3 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2008-03-29 Lucas Rocha <lucasr.at.mundo@gmail.com>
* src/metacity.desktop.in, src/Makefile.am: make Metacity
install its desktop files in the default session directory
as required by the new gnome-session. (Closes #525051.)
2008-03-29 Thomas Thurman <tthurman@gnome.org> 2008-03-29 Thomas Thurman <tthurman@gnome.org>
* src/ui/preview-widget.c (meta_preview_get_clip_region): * src/ui/preview-widget.c (meta_preview_get_clip_region):

9
src/Makefile.am
View File

@ -149,6 +149,7 @@ desktopfilesdir=$(datadir)/gnome/wm-properties
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@ @INTLTOOL_DESKTOP_RULE@
schemadir = @GCONF_SCHEMA_FILE_DIR@ schemadir = @GCONF_SCHEMA_FILE_DIR@
@ -170,6 +171,14 @@ else
install-data-local: install-data-local:
endif endif
sessiondir = $(datadir)/gnome/default-session;
install-data-hook:
if test -z "$(sessiondir)" ; then \
$(MKDIR_P) $(sessiondir) \
fi
$(LN_S) -f $(desktopfilesdir)/$(desktopfiles_DATA) $(sessiondir)
IMAGES=default_icon.png stock_maximize.png stock_minimize.png stock_delete.png IMAGES=default_icon.png stock_maximize.png stock_minimize.png stock_delete.png
VARIABLES=default_icon_data $(srcdir)/default_icon.png \ VARIABLES=default_icon_data $(srcdir)/default_icon.png \
stock_maximize_data $(srcdir)/stock_maximize.png \ stock_maximize_data $(srcdir)/stock_maximize.png \

4
src/metacity.desktop.in
View File

@ -1,4 +1,5 @@
[Desktop Entry] [Desktop Entry]
Type=Application
Encoding=UTF-8 Encoding=UTF-8
_Name=Metacity _Name=Metacity
Exec=metacity Exec=metacity
@ -11,6 +12,9 @@ X-GnomeWMSettingsLibrary=metacity
X-GNOME-Bugzilla-Bugzilla=GNOME X-GNOME-Bugzilla-Bugzilla=GNOME
X-GNOME-Bugzilla-Product=metacity X-GNOME-Bugzilla-Product=metacity
X-GNOME-Bugzilla-Component=general X-GNOME-Bugzilla-Component=general
X-GNOME-Autostart-Phase=WindowManager
X-GNOME-Provides=windowmanager
X-GNOME-Autostart-Notify=true
[Window Manager] [Window Manager]
SessionManaged=true SessionManaged=true