Desktop File spec vs. KDE vs. gnome-panel

[George]

On Thu, Jul 31, 2003 at 12:30:51PM +0200, Heinrich Wendel wrote:
> > Hmmm, true.  In this case we just have to standardize on the KDE way of
> > doing it.  And the spec needs to be updated.
> 
> Yes, can you please provide a patch to it.

Heh, damnit, did I just volunteer for this ? :)

OK, here's the patch.  Changes description of %i, %c and %k to the KDE
semantics and makes it clearer as to what the behaviour for them should be.
Also adds to the comment about %m and how it should be handled, if it is
handled (it can just be ignored, that is expanded to no parameters).

Also the spec currently says that unknown format chars are disallowed (a
fatal error), so I added a note that deprecated format chars are allowed
and can be ignored.

George


-- 
George <jirka at 5z.com>
   Religion is what keeps the poor from murdering the rich.
                       -- Napoleon
-------------- next part --------------
Index: desktop-entry-spec-0.9.4.xml
===================================================================
RCS file: /home/freedesktop/web/content/standards/desktop-entry-spec/desktop-entry-spec-0.9.4.xml,v
retrieving revision 1.1
diff -u -r1.1 desktop-entry-spec-0.9.4.xml
--- desktop-entry-spec-0.9.4.xml	19 Jul 2003 13:14:43 -0000	1.1
+++ desktop-entry-spec-0.9.4.xml	1 Aug 2003 17:02:56 -0000
@@ -633,7 +633,9 @@
     <para>
       Literal % characters must be escaped as %%, and adding new
       format characters is not allowed. It's a fatal error to have an
-      Exec field with a format character not given in the spec.
+      Exec field with a format character not given in the spec (exception
+      to this are the deprecated format characters which can be ignored,
+      that is expanded to no parameters, by the implementation).
       Again for emphasis: <emphasis>nonstandard extensions are 
       not allowed here - you must add an X-Foo-Exec field if you have
       nonstandard Exec lines</emphasis>.
@@ -711,19 +713,19 @@
 	  <row>
 	    <entry>%i</entry>
 	    <entry>
-	      the icon associated with the desktop entry
+              the Icon field of the desktop entry expanded as two parameters, first "--icon" and then the contents of the Icon field (should not expand as any prameters if the Icon field is empty or missing)
 	    </entry>
 	  </row>
 	  <row>
 	    <entry>%c</entry>
 	    <entry>
-	      the comment associated with the desktop entry
+	      the translated Name field associated with the desktop entry
 	    </entry>
 	  </row>
 	  <row>
 	    <entry>%k</entry>
 	    <entry>
-	      the name of the desktop file
+	      the location of the desktop file as either a uri (if for example gotten from the vfolder system) or a local filename or empty if no location is known
 	    </entry>
 	  </row>
 	  <row>
@@ -896,7 +898,7 @@
       </listitem>
       <listitem>
         <para>
-          Deprecated ExecParameters: %m (the mini-icon associated with the desktop entry)
+          Deprecated ExecParameters: %m (the mini-icon associated with the desktop entry, this should be expanded as two parameters, "--miniicon" and the content of the Icon field, it can also be ignored by expanding it to no parameters)
         </para>
       </listitem>
       <listitem>