apply fixes from Ville Skyttä <ville.skytta@iki.fi> to match the latest

2006-11-07  Ray Strode  <rstrode@redhat.com>

	* misc/desktop-entry-mode.el: apply fixes
	from Ville Skyttä <ville.skytta@iki.fi> to match the
	latest version of the spec

2 files changed, 43 insertions, 28 deletions

diff --git a/ChangeLog b/ChangeLog
index c12b313..2acbf4d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,17 +1,23 @@
-2006-11-06  Ray Strode <rstrode@redhat.com>
+2006-11-07  Ray Strode  <rstrode@redhat.com>
+
+	* misc/desktop-entry-mode.el: apply fixes
+	from Ville Skyttä <ville.skytta@iki.fi> to match the
+	latest version of the spec
+
+2006-11-06  Ray Strode  <rstrode@redhat.com>
 
 	* src/desktop_file.c: 
 	fix a couple of mem leaks.  Patch from Pascal Terjan
-	(gnoem bug 345686)
+	(gnome bug 345686)
 
-2006-11-06  Ray Strode <rstrode@redhat.com>
+2006-11-06  Ray Strode  <rstrode@redhat.com>
 
 	* src/desktop_file.c: 
 	move g_free inside if branch to prevent a double free in
 	the else case. Patch from Pascal Terjan (gnome bug
 	345309)
 
-2006-11-06  Ray Strode <rstrode@redhat.com>
+2006-11-06  Ray Strode  <rstrode@redhat.com>
 
 	* src/validate.c: fix category typos:
 	TeminalEmulator -> TerminalEmulator
@@ -19,23 +25,23 @@
 	spotted by Vincent Fretin (in gnome bug
 	342799)
 
-2006-11-06  Ray Strode <rstrode@redhat.com>
+2006-11-06  Ray Strode  <rstrode@redhat.com>
 
 	* src/validate.c: add patch from Vincent Untz to
 	not validate categories that start with X-
 	(gnome bug 343799)
 
-2006-07-25  Ray Strode <rstrode@redhat.com>
+2006-07-25  Ray Strode  <rstrode@redhat.com>
 
 	* src/egg*: remove from cvs
 
-2006-04-18  Ray Strode <rstrode@redhat.com>
+2006-04-18  Ray Strode  <rstrode@redhat.com>
 
 	* configure.in: post-release bump to 0.12.
 
 ==================== 0.11 ====================
 
-2006-04-18  Ray Strode <rstrode@redhat.com>
+2006-04-18  Ray Strode  <rstrode@redhat.com>
 
 	Validate that desktop file categories match those
 	specified in the spec.  Patch from Emmet Hikory
diff --git a/misc/desktop-entry-mode.el b/misc/desktop-entry-mode.el
index d2cb343..affaa2e 100644
--- a/misc/desktop-entry-mode.el
+++ b/misc/desktop-entry-mode.el
@@ -1,6 +1,6 @@
 ;;; desktop-entry-mode.el --- freedesktop.org desktop entry editing
 
-;; Copyright (C) 2003-2004, Ville Skyttä, <scop at xemacs.org>
+;; Copyright (C) 2003-2004, 2006, Ville Skyttä, <scop at xemacs.org>
 
 ;; Author:   Ville Skyttä, <scop at xemacs.org>
 ;; Keywords: unix, desktop entry
@@ -19,8 +19,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with XEmacs; see the file COPYING.  If not, write to the Free
-;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-;; 02111-1307, USA.
+;; Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+;; MA 02110-1301 USA.
 
 ;;; Commentary:
 
@@ -45,11 +45,11 @@
 ;; For more information about desktop entry files, see
 ;;   <http://www.freedesktop.org/Standards/desktop-entry-spec>
 ;;
-;; This version is up to date with version 0.9.4 of the specification.
+;; This version is up to date with version 0.9.8 of the specification.
 
 ;;; Code:
 
-(defconst desktop-entry-mode-version "0.94 (spec 0.9.4)"
+(defconst desktop-entry-mode-version "0.98 (spec 0.9.8)"
   "Version of `desktop-entry-mode'.")
 
 (defgroup desktop-entry nil
@@ -97,39 +97,48 @@
       '(
         "Type"
         "Version"
-        "Encoding"
         "Name"
         "GenericName"
         "NoDisplay"
         "Comment"
         "Icon"
         "Hidden"
-        "FilePattern"
+        "OnlyShowIn"
+        "NotShowIn"
         "TryExec"
         "Exec"
         "Path"
         "Terminal"
-        "SwallowTitle"
-        "SwallowExec"
-        "Actions"
         "MimeType"
-        "SortOrder"
-        "Dev"
-        "FSType"
-        "MountPoint"
-        "ReadOnly"
-        "UnmountIcon"
-        "URL"
         "Categories"
-        "OnlyShowIn"
-        "NotShowIn"
         "StartupNotify"
         "StartupWMClass"
-        ;; Reserved for use with KDE as of spec 0.9.4.
+        "URL"
+        ;; Reserved for use with KDE
         "ServiceTypes"
         "DocPath"
         "KeyWords"
         "InitialPreference"
+        ;; Used by KDE for entries of the FSDevice type
+        "Dev"
+        "FSType"
+        "MountPoint"
+        "ReadOnly"
+        "UnmountIcon"
+        ;; Deprecated
+        "Patterns"
+        "DefaultApp"
+        "Encoding"
+        "MiniIcon"
+        "TerminalOptions"
+        "Protocols"
+        "Extensions"
+        "BinaryPattern"
+        "MapNotify"
+        "SwallowTitle"
+        "SwallowExec"
+        "SortOrder"
+        "FilePattern"
         ) 'words)
      "\\|X-[A-Za-z0-9-]+\\)"))
   "Expression for matching desktop entry keys.")