summaryrefslogtreecommitdiff
path: root/gtk
diff options
context:
space:
mode:
authorDanny Baumann <dannybaumann@web.de>2008-11-04 14:51:13 +0100
committerDanny Baumann <dannybaumann@web.de>2009-03-08 13:21:32 +0100
commitd2ca4c19f1a3f470a8830c4ea36049f4bb4415cd (patch)
tree03a059fbadfd92ae09d25a06e9e899bf517d67e9 /gtk
parent517bd09546545ac8873c09eb7d5a65990a891d28 (diff)
downloadzcomp-d2ca4c19f1a3f470a8830c4ea36049f4bb4415cd.tar.gz
zcomp-d2ca4c19f1a3f470a8830c4ea36049f4bb4415cd.tar.bz2
Bring desktop files in line with gnome-session 2.24 changes.
Diffstat (limited to 'gtk')
-rw-r--r--gtk/gnome/CMakeLists.txt12
-rw-r--r--gtk/gnome/compiz-wm.desktop.in17
-rw-r--r--gtk/gnome/compiz.desktop.in8
3 files changed, 34 insertions, 3 deletions
diff --git a/gtk/gnome/CMakeLists.txt b/gtk/gnome/CMakeLists.txt
index daf6d56..b62ac0a 100644
--- a/gtk/gnome/CMakeLists.txt
+++ b/gtk/gnome/CMakeLists.txt
@@ -22,9 +22,20 @@ if (USE_GNOME)
)
install (
FILES ${desktop_file}
+ DESTINATION ${datadir}/applications
+ )
+
+ set (wmproperties_file ${CMAKE_CURRENT_BINARY_DIR}/compiz-wm.desktop)
+ translate_wmproperties_file (
+ ${CMAKE_CURRENT_SOURCE_DIR}/compiz-wm.desktop.in
+ ${desktop_file}
+ )
+ install (
+ FILES ${wmproperties_file}
DESTINATION ${windowsettingsdatadir}/gnome/wm-properties
)
+
if (USE_GNOME_KEYBINDINGS)
translate_xml (
${CMAKE_CURRENT_SOURCE_DIR}/50-compiz-desktop-key.xml.in
@@ -49,6 +60,7 @@ if (USE_GNOME)
compiz-window-manager.h
${key_xml}
${desktop_file}
+ ${wmproperties_file}
)
set_target_properties (gnome-compiz
diff --git a/gtk/gnome/compiz-wm.desktop.in b/gtk/gnome/compiz-wm.desktop.in
new file mode 100644
index 0000000..bb3967a
--- /dev/null
+++ b/gtk/gnome/compiz-wm.desktop.in
@@ -0,0 +1,17 @@
+[Desktop Entry]
+Type=Application
+Encoding=UTF-8
+_Name=Compiz
+Exec=compiz
+# name of loadable control center module
+X-GNOME-WMSettingsModule=compiz
+# autostart phase
+X-GNOME-Autostart-Phase=WindowManager
+X-GNOME-Provides=windowmanager
+# name we put on the WM spec check window
+X-GNOME-WMName=compiz
+# back compat only
+X-GnomeWMSettingsLibrary=compiz
+
+[Window Manager]
+SessionManaged=false
diff --git a/gtk/gnome/compiz.desktop.in b/gtk/gnome/compiz.desktop.in
index cde9bae..fce1407 100644
--- a/gtk/gnome/compiz.desktop.in
+++ b/gtk/gnome/compiz.desktop.in
@@ -1,13 +1,15 @@
[Desktop Entry]
+Type=Application
Encoding=UTF-8
_Name=Compiz
Exec=compiz
+NoDisplay=true
# name of loadable control center module
X-GNOME-WMSettingsModule=compiz
+# autostart phase
+X-GNOME-Autostart-Phase=WindowManager
+X-GNOME-Provides=windowmanager
# name we put on the WM spec check window
X-GNOME-WMName=compiz
# back compat only
X-GnomeWMSettingsLibrary=compiz
-
-[Window Manager]
-SessionManaged=false