Merge branch 'master' into chaz

[chaz/openbox] / data / openbox.desktop

diff --git a/data/openbox.desktop b/data/openbox.desktop
index 17cf3101de7e762ef8985842d1dd03eb632717c7..631778bf1dc445147507235138c2a640feb6ac86 100644 (file)
--- a/data/openbox.desktop
+++ b/data/openbox.desktop
@@ -1,12 +1,15 @@
 [Desktop Entry]
+Type=Application
 Name=Openbox
 Exec=openbox
-# name of loadable control center module
-X-GNOME-WMSettingsModule=openbox
+Icon=openbox
+NoDisplay=true
 # name we put on the WM spec check window
 X-GNOME-WMName=Openbox
-# back compat only
-X-GnomeWMSettingsLibrary=openbox
-
-[Window Manager]
-SessionManaged=true
+# gnome-session autostart
+X-GNOME-Autostart-Phase=WindowManager
+X-GNOME-Provides=windowmanager
+# Ubuntu stuff
+X-Ubuntu-Gettext-Domain=openbox
+# back compat
+X-GNOME-Autostart-Notify=true