Merge branch 'backport' into work

[chaz/openbox] / data / openbox.desktop

diff --git a/data/openbox.desktop b/data/openbox.desktop
index 559a1a001a20fc7238a7662cd6ae494b4b394935..9c19e67ebd1d50cc9a79ee70d0316726232b0bc9 100644 (file)
--- a/data/openbox.desktop
+++ b/data/openbox.desktop
@@ -1,9 +1,12 @@
 [Desktop Entry]
+Type=Application
+Encoding=UTF-8
 Name=Openbox
 Exec=openbox
-
+Icon=openbox
+NoDisplay=true
 # name we put on the WM spec check window
 X-GNOME-WMName=Openbox
-
-# our config tool
-ConfigExec=obconf2
+X-GNOME-Autostart-Phase=WindowManager
+X-GNOME-Provides=windowmanager
+X-GNOME-Autostart-Notify=true