glib r7635 - in branches/glib-2-18: . gio

[gbowland svn gnome org]

Author: gbowland
Date: Fri Oct 31 02:23:30 2008
New Revision: 7635
URL: http://svn.gnome.org/viewvc/glib?rev=7635&view=rev

Log:
2008-10-31  Grahame Bowland  <grahame angrygoats net>

	Bug 558185 â 'parent' variable in g_local_file_get_child_for_display_name() 
	hits g_object_unref(NULL) assertion

	* gio/glocalfile.c: 
	- remove unused variable. Patch by Matt Johnston <matt ucc asn au>


Modified:
   branches/glib-2-18/ChangeLog
   branches/glib-2-18/gio/glocalfile.c

Modified: branches/glib-2-18/gio/glocalfile.c
==============================================================================
--- branches/glib-2-18/gio/glocalfile.c	(original)
+++ branches/glib-2-18/gio/glocalfile.c	Fri Oct 31 02:23:30 2008
@@ -592,7 +592,7 @@
 					 const char   *display_name,
 					 GError      **error)
 {
-  GFile *parent, *new_file;
+  GFile *new_file;
   char *basename;
 
   basename = g_filename_from_utf8 (display_name, -1, NULL, NULL, NULL);
@@ -604,9 +604,7 @@
       return NULL;
     }
 
-  parent = g_file_get_parent (file);
   new_file = g_file_get_child (file, basename);
-  g_object_unref (parent);
   g_free (basename);
   
   return new_file;