epiphany r8240 - branches/gnome-2-22/src/bookmarks

[diegoe svn gnome org]

Author: diegoe
Date: Tue May 20 06:00:15 2008
New Revision: 8240
URL: http://svn.gnome.org/viewvc/epiphany?rev=8240&view=rev

Log:
Don't free file_info too soon or the pointer to file_type will be lost. This
fixes bookmark imports not working (note that HTML import is not working, only
RDF). Patch by Sebastian Keller, closes: #523414.



Modified:
   branches/gnome-2-22/src/bookmarks/ephy-bookmarks-import.c

Modified: branches/gnome-2-22/src/bookmarks/ephy-bookmarks-import.c
==============================================================================
--- branches/gnome-2-22/src/bookmarks/ephy-bookmarks-import.c	(original)
+++ branches/gnome-2-22/src/bookmarks/ephy-bookmarks-import.c	Tue May 20 06:00:15 2008
@@ -83,7 +83,6 @@
 				       G_FILE_ATTRIBUTE_STANDARD_CONTENT_TYPE,
 				       0, NULL, NULL);
 	type = g_file_info_get_content_type (file_info);
-	g_object_unref (file_info);
 
 	g_debug ("Importing bookmarks of type %s", type ? type : "(null)");
 
@@ -132,6 +131,7 @@
 		g_free (basename);
 	}
 
+	g_object_unref (file_info);
 	g_object_unref (file);
 
 	return success;