Make .desktop files pass desktop-file-validate

Original patch provided by 'pacho'

diff --git a/avahi-python/avahi-discover/avahi-discover.desktop.in.in b/avahi-python/avahi-discover/avahi-discover.desktop.in.in
index 031024c..dac9818 100644 (file)
--- a/avahi-python/avahi-discover/avahi-discover.desktop.in.in
+++ b/avahi-python/avahi-discover/avahi-discover.desktop.in.in
@@ -1,12 +1,11 @@
 [Desktop Entry]
 Version=1.0
-Encoding=UTF-8
 _Name=Avahi Zeroconf Browser
 _Comment=Browse for Zeroconf services available on your network
 Exec=@bindir@/avahi-discover
 Terminal=false
 Type=Application
 Icon=network-wired
-Categories=GNOME;Application;System;
+Categories=GNOME;System;
 StartupNotify=false
 GenericName=

diff --git a/avahi-ui/bssh.desktop.in.in b/avahi-ui/bssh.desktop.in.in
index 69f56b6..a4e54fe 100644 (file)
--- a/avahi-ui/bssh.desktop.in.in
+++ b/avahi-ui/bssh.desktop.in.in
@@ -1,12 +1,11 @@
 [Desktop Entry]
 Version=1.0
-Encoding=UTF-8
 _Name=Avahi SSH Server Browser
 _Comment=Browse for Zeroconf-enabled SSH Servers
 Exec=@bindir@/bssh
 Terminal=false
 Type=Application
 Icon=network-wired
-Categories=GNOME;Application;Network;
+Categories=GNOME;Network;
 StartupNotify=false
 GenericName=

diff --git a/avahi-ui/bvnc.desktop.in.in b/avahi-ui/bvnc.desktop.in.in
index 799c7d2..92b8247 100644 (file)
--- a/avahi-ui/bvnc.desktop.in.in
+++ b/avahi-ui/bvnc.desktop.in.in
@@ -1,12 +1,11 @@
 [Desktop Entry]
 Version=1.0
-Encoding=UTF-8
 _Name=Avahi VNC Server Browser
 _Comment=Browse for Zeroconf-enabled VNC Servers
 Exec=@bindir@/bvnc
 Terminal=false
 Type=Application
 Icon=network-wired
-Categories=GNOME;Application;Network;
+Categories=GNOME;Network;
 StartupNotify=false
 GenericName=