Bug 528600 – g_dummy_file_get_parent("scheme://example.com/")

* gdummyfile.c (g_dummy_file_get_parent): Return NULL if there
        is no parent.  (Owen Taylor, patch by Christian Neumair)


svn path=/branches/glib-2-16/; revision=7119
This commit is contained in:
Matthias Clasen
2008-07-01 02:39:26 +00:00
parent e34b0b5c72
commit c800a9a4f2
2 changed files with 11 additions and 1 deletions

View File

@@ -1,3 +1,12 @@
2008-06-30 Matthias Clasen <mclasen@redhat.com>
Backported from trunk:
Bug 528600 g_dummy_file_get_parent("scheme://example.com/")
* gdummyfile.c (g_dummy_file_get_parent): Return NULL if there
is no parent. (Owen Taylor, patch by Christian Neumair)
2008-06-30 Matthias Clasen <mclasen@redhat.com>
Backported from trunk:

View File

@@ -172,7 +172,8 @@ g_dummy_file_get_parent (GFile *file)
char *uri;
GDecodedUri new_decoded_uri;
if (dummy->decoded_uri == NULL)
if (dummy->decoded_uri == NULL ||
g_strcmp0 (dummy->decoded_uri->path, "/") == 0)
return NULL;
dirname = g_path_get_dirname (dummy->decoded_uri->path);