Add support for expanding the desktop entry spec variables %U (list of

2007-01-02  Emmanuele Bassi  <ebassi@gnome.org>

	* glib/gbookmarkfile.c (expand_exec_line): Add support for
	expanding the desktop entry spec variables %U (list of URIs)
	and %F (list of filenames), so that using the command line
	from the Exec and TryExec key of a desktop entry file works
	as intended.

svn path=/trunk/; revision=5196

diff --git a/ChangeLog b/ChangeLog
index 6e38a99a838c83f8684c5dd5afa949b01d62254a..06fc45353157dcd307ad151cd27cb4cd73a7e9c0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2007-01-02  Emmanuele Bassi  <ebassi@gnome.org>
+
+       * glib/gbookmarkfile.c (expand_exec_line): Add support for
+       expanding the desktop entry spec variables %U (list of URIs)
+       and %F (list of filenames), so that using the command line
+       from the Exec and TryExec key of a desktop entry file works
+       as intended.
+
 2007-01-02  Matthias Clasen  <mclasen@redhat.com>
 
        * configure.in: Avoid warnings from running libtool --config.

diff --git a/glib/gbookmarkfile.c b/glib/gbookmarkfile.c
index ee67699943b152cdfa4c684ce4266a2425d0d5f0..c2982f13e5bde15bc97fa77aacae1b6a8c0b841f 100644 (file)
--- a/glib/gbookmarkfile.c
+++ b/glib/gbookmarkfile.c
@@ -3300,9 +3300,11 @@ expand_exec_line (const gchar *exec_fmt,
        {
        case '\0':
         goto out;
+       case 'U':
        case 'u':
          g_string_append (exec, uri);
          break;
+       case 'F':
        case 'f':
          {
           gchar *file = g_filename_from_uri (uri, NULL, NULL);