Commit 2d8e5ef8 authored by Bastien Nocera's avatar Bastien Nocera Committed by Alexander Larsson

gdesktopappinfo: Call g_file_get_path() on demand

Rather than always calling out to g_file_get_path() (which
might block, whatever the documentation might say), postpone
the call until we actually need it.

https://bugzilla.gnome.org/show_bug.cgi?id=708753
parent 458c1c0f
......@@ -869,11 +869,10 @@ expand_macro_single (char macro, char *uri)
{
GFile *file;
char *result = NULL;
char *path, *name;
char *path = NULL;
char *name;
file = g_file_new_for_uri (uri);
path = g_file_get_path (file);
g_object_unref (file);
switch (macro)
{
......@@ -883,11 +882,13 @@ expand_macro_single (char macro, char *uri)
break;
case 'f':
case 'F':
path = g_file_get_path (file);
if (path)
result = g_shell_quote (path);
break;
case 'd':
case 'D':
path = g_file_get_path (file);
if (path)
{
name = g_path_get_dirname (path);
......@@ -897,6 +898,7 @@ expand_macro_single (char macro, char *uri)
break;
case 'n':
case 'N':
path = g_file_get_path (file);
if (path)
{
name = g_path_get_basename (path);
......@@ -906,6 +908,7 @@ expand_macro_single (char macro, char *uri)
break;
}
g_object_unref (file);
g_free (path);
return result;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment