From Stéphane Loeuillet: patches to fix problems with the .desktop files

found by desktop-file-validate:

  wireshark.desktop: warning: value "" for key "Path" in group "Desktop Entry"
  does not look like an absolute path
  wireshark.desktop: warning: value "GNOME;Application;Network;" for key
  "Categories" in group "Desktop Entry" contains a deprecated value
  "Application"

  wireshark-root.desktop: warning: key "Encoding" in group "Desktop Entry" is
  deprecated
  wireshark-root.desktop: warning: value "" for key "Path" in group "Desktop
  Entry" does not look like an absolute path
  wireshark-root.desktop: warning: value "GNOME;Application;Network;" for key
  "Categories" in group "Desktop Entry" contains a deprecated value
  "Application"

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@23034 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/AUTHORS b/AUTHORS
index bef13c9383d88cf1e5a62cefbe9444472d1ada34..c12020d670c5f42893d769e0120ac37e7d601313 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -2810,6 +2810,7 @@ Ian Brumby                <ian.brumby [AT] baesystems.com>
 Todd J Martin          <todd.martin [AT] acm.org>
 Scott Robinson         <scott.robinson [AT] flukenetworks.com>
 Martin Peylo           <wireshark [AT] izac.de>
+Stéphane Loeuillet    <leroutier@gmail.com>
 
 Alain Magloire <alainm[AT]rcsm.ece.mcgill.ca> was kind enough to
 give his permission to use his version of snprintf.c.

diff --git a/debian/wireshark-root.desktop b/debian/wireshark-root.desktop
index 4b38d5347270bde48dd55e88f74d4ad981b290ae..e90f96292a917b5dcaa967d42d758cb48116a73e 100644 (file)
--- a/debian/wireshark-root.desktop
+++ b/debian/wireshark-root.desktop
@@ -5,7 +5,6 @@
 # The entries are in the order they are listed in version 0.9.4
 Type=Application
 Version=1.0
-Encoding=UTF-8
 Name=Wireshark (as root)
 GenericName=Network Analyzer
 GenericName[af]=Netwerk Analiseerder
@@ -71,10 +70,8 @@ Comment[sv]=Nätverkstrafikanalysator
 Icon=hi48-app-wireshark.png
 TryExec=gksu
 Exec=gksu -u root /usr/bin/wireshark
-Path=
 Terminal=false
-MimeType=
-Categories=GNOME;Application;Network;
+Categories=GNOME;Network;
 # Found in Suse 9.1:
 X-KDE-SubstituteUID=true
 # Deprecated:

diff --git a/wireshark.desktop b/wireshark.desktop
index a7fcde3644edceaf5bd45f7924e8d56b829e5b3f..aa67628a528bf31eb292529fa8a7636ebfc23fb8 100644 (file)
--- a/wireshark.desktop
+++ b/wireshark.desktop
@@ -71,8 +71,6 @@ Comment[sv]=Nätverkstrafikanalysator
 Icon=wireshark.png
 TryExec=wireshark
 Exec=wireshark
-Path=
 Terminal=false
-MimeType=
-Categories=Application;GTK;Network;X-Red-Hat-Extra;
+Categories=GTK;Network;X-Red-Hat-Extra;
 X-KDE-SubstituteUID=true