From 9154bddf35a7abe98df011856c86b052e4ae50d8 Mon Sep 17 00:00:00 2001
From: Julian Ospald <julian.ospald@googlemail.com>
Date: Sun, 30 Sep 2012 22:54:18 -0400
Subject: [PATCH] Make .desktop files obey specs where possible (Fix bug 5737)

---
 data/openbox.desktop                   | 1 -
 data/xsession/openbox-gnome.desktop.in | 5 ++---
 data/xsession/openbox-kde.desktop.in   | 5 ++---
 data/xsession/openbox.desktop.in       | 5 ++---
 4 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/data/openbox.desktop b/data/openbox.desktop
index d49ae227..631778bf 100644
--- a/data/openbox.desktop
+++ b/data/openbox.desktop
@@ -1,6 +1,5 @@
 [Desktop Entry]
 Type=Application
-Encoding=UTF-8
 Name=Openbox
 Exec=openbox
 Icon=openbox
diff --git a/data/xsession/openbox-gnome.desktop.in b/data/xsession/openbox-gnome.desktop.in
index 19ae82e0..24931b50 100644
--- a/data/xsession/openbox-gnome.desktop.in
+++ b/data/xsession/openbox-gnome.desktop.in
@@ -1,8 +1,7 @@
 [Desktop Entry]
-Encoding=UTF-8
 Name=GNOME/Openbox
 Comment=Use the Openbox window manager inside of the GNOME desktop environment
 Exec=@bindir@/openbox-gnome-session
 TryExec=gnome-session
-Icon=openbox.png
-Type=XSession
+Icon=openbox
+Type=Application
diff --git a/data/xsession/openbox-kde.desktop.in b/data/xsession/openbox-kde.desktop.in
index ddfc72d7..bc78a97c 100644
--- a/data/xsession/openbox-kde.desktop.in
+++ b/data/xsession/openbox-kde.desktop.in
@@ -1,8 +1,7 @@
 [Desktop Entry]
-Encoding=UTF-8
 Name=KDE/Openbox
 Comment=Use the Openbox window manager inside of the K Desktop Environment
 Exec=@bindir@/openbox-kde-session
 TryExec=startkde
-Icon=openbox.png
-Type=XSession
+Icon=openbox
+Type=Application
diff --git a/data/xsession/openbox.desktop.in b/data/xsession/openbox.desktop.in
index 0914e5b4..21669cf8 100644
--- a/data/xsession/openbox.desktop.in
+++ b/data/xsession/openbox.desktop.in
@@ -1,8 +1,7 @@
 [Desktop Entry]
-Encoding=UTF-8
 Name=Openbox
 Comment=Log in using the Openbox window manager (without a session manager)
 Exec=@bindir@/openbox-session
 TryExec=@bindir@/openbox-session
-Icon=openbox.png
-Type=XSession
+Icon=openbox
+Type=Application