From a3b70ff0da606fe096d4d84333876beac6d95bf3 Mon Sep 17 00:00:00 2001
From: Guy Harris <guy@alum.mit.edu>
Date: Sun, 30 Sep 2007 00:18:44 +0000
Subject: =?UTF-8?q?From=20St=C3=A9phane=20Loeuillet:=20patches=20to=20fix?=
 =?UTF-8?q?=20problems=20with=20the=20.desktop=20files=20found=20by=20desk?=
 =?UTF-8?q?top-file-validate:?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

  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"

svn path=/trunk/; revision=23034
---
 AUTHORS                       | 1 +
 debian/wireshark-root.desktop | 5 +----
 wireshark.desktop             | 4 +---
 3 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index bef13c9383..c12020d670 100644
--- 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 4b38d53472..e90f96292a 100644
--- 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 a7fcde3644..aa67628a52 100644
--- 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
-- 
cgit v1.2.3