aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Persch <chpe@cvs.gnome.org>2004-10-20 01:35:31 +0800
committerChristian Persch <chpe@src.gnome.org>2004-10-20 01:35:31 +0800
commit51d9cb2d971c06038eeca975aa9b59027203f452 (patch)
treea9654a30d65d3754b4f4a2100f29feaa66ce868e
parente2adcaa9c470111f7e585fe959de4b17f75fef7e (diff)
downloadgsoc2013-epiphany-51d9cb2d971c06038eeca975aa9b59027203f452.tar
gsoc2013-epiphany-51d9cb2d971c06038eeca975aa9b59027203f452.tar.gz
gsoc2013-epiphany-51d9cb2d971c06038eeca975aa9b59027203f452.tar.bz2
gsoc2013-epiphany-51d9cb2d971c06038eeca975aa9b59027203f452.tar.lz
gsoc2013-epiphany-51d9cb2d971c06038eeca975aa9b59027203f452.tar.xz
gsoc2013-epiphany-51d9cb2d971c06038eeca975aa9b59027203f452.tar.zst
gsoc2013-epiphany-51d9cb2d971c06038eeca975aa9b59027203f452.zip
Fix import of bookmarks in root folder. Fixes bug #152443.
2004-10-19 Christian Persch <chpe@cvs.gnome.org> * src/bookmarks/ephy-bookmarks-import.c: (xbel_parse_xbel): Fix import of bookmarks in root folder. Fixes bug #152443.
-rw-r--r--ChangeLog6
-rw-r--r--src/bookmarks/ephy-bookmarks-import.c2
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 35a7d427b..47742c8bc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2004-10-19 Christian Persch <chpe@cvs.gnome.org>
+
+ * src/bookmarks/ephy-bookmarks-import.c: (xbel_parse_xbel):
+
+ Fix import of bookmarks in root folder. Fixes bug #152443.
+
2004-10-18 Adam Hooper <adamh@cvs.gnome.org>
* data/epiphany-extension.xsd:
diff --git a/src/bookmarks/ephy-bookmarks-import.c b/src/bookmarks/ephy-bookmarks-import.c
index f41c882d5..391d4c2e9 100644
--- a/src/bookmarks/ephy-bookmarks-import.c
+++ b/src/bookmarks/ephy-bookmarks-import.c
@@ -418,7 +418,7 @@ xbel_parse_xbel (EphyBookmarks *eb, xmlTextReaderPtr reader)
/* shouldn't happen but does anyway :( */
}
else if (xmlStrEqual (tag, (xmlChar *) "bookmark") && type == XML_READER_TYPE_ELEMENT
- && state == STATE_FOLDER)
+ && state == STATE_XBEL)
{
EphyNode *node = NULL;