Commit df719f74 authored by Grahame Bowland's avatar Grahame Bowland Committed by Grahame Michael Bowland
Browse files

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
parent b54e0af9
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
......
......@@ -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;
......
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