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 031024c4a277aa3bb9df4e8ec273dc9c5c9e6d79..dac9818bb56ff2c65a54c0eb83d36b7d31d98196 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 69f56b6de0de4200b3b164705983b01f3e956cce..a4e54fef046036e762ce2cf16bcc2b9cc7d539d8 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 799c7d20a96a1b10abf4e4d1d72d480fe0d95be8..92b82471f850f0f27bc055e966fb4a5d172c35fa 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=