diff options
author | Emmanuele Bassi <ebassi@gnome.org> | 2007-01-02 16:20:48 +0000 |
---|---|---|
committer | Emmanuele Bassi <ebassi@src.gnome.org> | 2007-01-02 16:20:48 +0000 |
commit | 029d43222f6af5b5223f9c92d3c1d4a1a30f0b3d (patch) | |
tree | c5c310ab1f1a64a4e6e1acfde113ed6106846f4e | |
parent | 7eab26d13b5a02ffcf2c19122675ca10dc7fa067 (diff) |
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
-rw-r--r-- | ChangeLog | 8 | ||||
-rw-r--r-- | glib/gbookmarkfile.c | 2 |
2 files changed, 10 insertions, 0 deletions
@@ -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 ee6769994..c2982f13e 100644 --- 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); |