Commit c59e67e2 authored by Garrett Regier's avatar Garrett Regier

Bug 584271 - Fix showing mounts who's uri is a file name

parent b58abf73
......@@ -716,30 +716,39 @@ gedit_utils_location_get_dirname_for_display (GFile *location)
if (mount != NULL)
{
gchar *mount_name;
gchar *path;
gchar *path = NULL;
gchar *dirname;
mount_name = g_mount_get_name (mount);
g_object_unref (mount);
/* obtain the "path" patrt of the uri */
if (gedit_utils_decode_uri (uri,
NULL, NULL,
NULL, NULL,
&path))
{
gchar *dirname;
dirname = gedit_utils_uri_get_dirname (path);
res = g_strdup_printf ("%s %s", mount_name, dirname);
/* obtain the "path" part of the uri */
gedit_utils_decode_uri (uri,
NULL, NULL,
NULL, NULL,
&path);
g_free (path);
g_free (dirname);
g_free (mount_name);
if (path == NULL)
{
dirname = gedit_utils_uri_get_dirname (uri);
}
else
{
dirname = gedit_utils_uri_get_dirname (path);
}
if (dirname == NULL || strcmp (dirname, ".") == 0)
{
res = mount_name;
}
else
{
res = g_strdup_printf ("%s %s", mount_name, dirname);
g_free (mount_name);
}
g_free (path);
g_free (dirname);
}
else
{
......
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