aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorDiego Escalante Urrelo <diegoe@src.gnome.org>2008-05-20 14:00:15 +0800
committerDiego Escalante Urrelo <diegoe@src.gnome.org>2008-05-20 14:00:15 +0800
commitbcbdd353b9d91163b334ebe1961cdb3217a40837 (patch)
tree97a578ded4d56a409df1cd4bf13de0f81b818f9d /src
parentb8b5ce3bba3644d96061c233692f33898429f9f0 (diff)
downloadgsoc2013-epiphany-bcbdd353b9d91163b334ebe1961cdb3217a40837.tar
gsoc2013-epiphany-bcbdd353b9d91163b334ebe1961cdb3217a40837.tar.gz
gsoc2013-epiphany-bcbdd353b9d91163b334ebe1961cdb3217a40837.tar.bz2
gsoc2013-epiphany-bcbdd353b9d91163b334ebe1961cdb3217a40837.tar.lz
gsoc2013-epiphany-bcbdd353b9d91163b334ebe1961cdb3217a40837.tar.xz
gsoc2013-epiphany-bcbdd353b9d91163b334ebe1961cdb3217a40837.tar.zst
gsoc2013-epiphany-bcbdd353b9d91163b334ebe1961cdb3217a40837.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=/branches/gnome-2-22/; revision=8240
Diffstat (limited to 'src')
-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;