diff options
| author | Lucas Rocha <lucasr.at.mundo@gmail.com> | 2008-03-30 00:01:18 +0000 |
|---|---|---|
| committer | Thomas James Alexander Thurman <tthurman@src.gnome.org> | 2008-03-30 00:01:18 +0000 |
| commit | fb588c60752e3470513599ec2c399fc9e870f6c6 (patch) | |
| tree | 86e684fb6be366851d9f03e55a32ae6aece51309 /src | |
| parent | 6a586e892940b34ee02ff94732fa3d9abe61cbab (diff) | |
| download | metacity-fb588c60752e3470513599ec2c399fc9e870f6c6.tar.gz | |
make Metacity install its desktop files in the default session directory
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
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.am | 9 | ||||
| -rw-r--r-- | src/metacity.desktop.in | 4 |
2 files changed, 13 insertions, 0 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 32e23a98..4bd0dc45 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -149,6 +149,7 @@ desktopfilesdir=$(datadir)/gnome/wm-properties desktopfiles_in_files=metacity.desktop.in desktopfiles_files=$(desktopfiles_in_files:.desktop.in=.desktop) desktopfiles_DATA = $(desktopfiles_files) + @INTLTOOL_DESKTOP_RULE@ schemadir = @GCONF_SCHEMA_FILE_DIR@ @@ -170,6 +171,14 @@ else install-data-local: 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 VARIABLES=default_icon_data $(srcdir)/default_icon.png \ stock_maximize_data $(srcdir)/stock_maximize.png \ diff --git a/src/metacity.desktop.in b/src/metacity.desktop.in index 2b131c9d..47045f01 100644 --- a/src/metacity.desktop.in +++ b/src/metacity.desktop.in @@ -1,4 +1,5 @@ [Desktop Entry] +Type=Application Encoding=UTF-8 _Name=Metacity Exec=metacity @@ -11,6 +12,9 @@ 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 |