aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDiego Escalante Urrelo <diegoe@src.gnome.org>2008-05-20 14:03:23 +0800
committerDiego Escalante Urrelo <diegoe@src.gnome.org>2008-05-20 14:03:23 +0800
commitba17f5316ff437e7656f87c8a022bbbc077b4c51 (patch)
tree7c56a13f95429521bfc429fd7a156e51dfc49c5e
parentef289f5590cb8d65361e022a1e8af73a84602250 (diff)
downloadgsoc2013-epiphany-ba17f5316ff437e7656f87c8a022bbbc077b4c51.tar
gsoc2013-epiphany-ba17f5316ff437e7656f87c8a022bbbc077b4c51.tar.gz
gsoc2013-epiphany-ba17f5316ff437e7656f87c8a022bbbc077b4c51.tar.bz2
gsoc2013-epiphany-ba17f5316ff437e7656f87c8a022bbbc077b4c51.tar.lz
gsoc2013-epiphany-ba17f5316ff437e7656f87c8a022bbbc077b4c51.tar.xz
gsoc2013-epiphany-ba17f5316ff437e7656f87c8a022bbbc077b4c51.tar.zst
gsoc2013-epiphany-ba17f5316ff437e7656f87c8a022bbbc077b4c51.zip
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. svn path=/trunk/; revision=8241
-rw-r--r--src/bookmarks/ephy-bookmarks-import.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/bookmarks/ephy-bookmarks-import.c b/src/bookmarks/ephy-bookmarks-import.c
index 44f5fd63a..3e7096679 100644
--- a/src/bookmarks/ephy-bookmarks-import.c
+++ b/src/bookmarks/ephy-bookmarks-import.c
@@ -83,7 +83,6 @@ ephy_bookmarks_import (EphyBookmarks *bookmarks,
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 @@ ephy_bookmarks_import (EphyBookmarks *bookmarks,
g_free (basename);
}
+ g_object_unref (file_info);
g_object_unref (file);
return success;