luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-02-03 01:36:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

g_app_info_launch_default_for_uri: don't use GFile if we don't have to

Browse Source 
GFile doesn't handle some "real" URIs, so check if there's a default
handler for the URI scheme first, and only use g_file_new_for_uri()
and g_file_query_default_handler() if not. Eg, this fixes the case of
opening http URIs with "%2F" in the path.

https://bugzilla.gnome.org/show_bug.cgi?id=666386
This commit is contained in:
Dan Winship 2012-05-18 08:49:05 -04:00
parent 0e6d9df35c
commit 555cd1923f
1 changed files with 26 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
gio/gappinfo.c
View File

@ -683,21 +683,37 @@ g_app_info_launch_default_for_uri (const char *uri,
GAppLaunchContext *launch_context, GAppLaunchContext *launch_context,
GError **error) GError **error)
{ {
char *uri_scheme;
GAppInfo *app_info; GAppInfo *app_info;
GFile *file;
GList l; GList l;
gboolean res; gboolean res;
file = g_file_new_for_uri (uri); /* g_file_query_default_handler() calls
app_info = g_file_query_default_handler (file, NULL, error); * g_app_info_get_default_for_uri_scheme() too, but we have to do it
g_object_unref (file); * here anyway in case GFile can't parse @uri correctly.
if (app_info == NULL)
return FALSE;
/* Use the uri, not the GFile, as the GFile roundtrip may
* affect the uri which we don't want (for instance for a
* mailto: uri).
*/ */
uri_scheme = g_uri_parse_scheme (uri);
if (uri_scheme && uri_scheme[0] != '\0')
app_info = g_app_info_get_default_for_uri_scheme (uri_scheme);
g_free (uri_scheme);
if (!app_info)
{
GFile *file;
file = g_file_new_for_uri (uri);
app_info = g_file_query_default_handler (file, NULL, error);
g_object_unref (file);
if (app_info == NULL)
return FALSE;
/* We still use the original @uri rather than calling
* g_file_get_uri(), because GFile might have modified the URI
* in ways we don't want (eg, removing the fragment identifier
* from a file: URI).
*/
}
l.data = (char *)uri; l.data = (char *)uri;
l.next = l.prev = NULL; l.next = l.prev = NULL;
res = g_app_info_launch_uris (app_info, &l, res = g_app_info_launch_uris (app_info, &l,