From: Grahame Bowland <grahame@angrygoats.net>
Date: Fri, 31 Oct 2008 02:23:55 +0000 (+0000)
Subject: Bug 558185 – 'parent' variable in
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=df719f749c9fa1f3966643eeba96eb5dd022b2ca;p=dana%2Fcg-glib.git

Bug 558185 – 'parent' variable in

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>

svn path=/trunk/; revision=7636
---

diff --git a/ChangeLog b/ChangeLog
index 4cd91f5a..55a5677d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+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>
+
 2008-10-29 16:11:14  Tim Janik  <timj@gtk.org>
 
 	* glib/gmacros.h: added G_PASTE() and G_STATIC_ASSERT(), based on
diff --git a/gio/glocalfile.c b/gio/glocalfile.c
index 7f168233..9577e726 100644
--- a/gio/glocalfile.c
+++ b/gio/glocalfile.c
@@ -592,7 +592,7 @@ g_local_file_get_child_for_display_name (GFile        *file,
 					 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 @@ g_local_file_get_child_for_display_name (GFile        *file,
       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;