glib r6987 - trunk/gio

[matthiasc svn gnome org]

Author: matthiasc
Date: Tue Jun 10 15:27:39 2008
New Revision: 6987
URL: http://svn.gnome.org/viewvc/glib?rev=6987&view=rev

Log:
        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 Persch)



Modified:
   trunk/gio/ChangeLog
   trunk/gio/gdummyfile.c

Modified: trunk/gio/gdummyfile.c
==============================================================================
--- trunk/gio/gdummyfile.c	(original)
+++ trunk/gio/gdummyfile.c	Tue Jun 10 15:27:39 2008
@@ -172,7 +172,8 @@
   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);