From 22b5564396f1f0bb07ec810e3238697edf62564e Mon Sep 17 00:00:00 2001 From: James Willcox Date: Thu, 6 Feb 2003 04:12:00 +0000 Subject: Make importing actually work properly. *cough* 2003-02-05 James Willcox * src/bookmarks/ephy-bookmarks-import.c: (xbel_parse_folder), (xbel_parse_bookmarks): Make importing actually work properly. *cough* --- ChangeLog | 7 +++++++ src/bookmarks/ephy-bookmarks-import.c | 19 ++----------------- 2 files changed, 9 insertions(+), 17 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1320daec1..021a90e5e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2003-02-05 James Willcox + + * src/bookmarks/ephy-bookmarks-import.c: (xbel_parse_folder), + (xbel_parse_bookmarks): + + Make importing actually work properly. *cough* + 2003-02-05 James Willcox * data/starthere/section.xsl: diff --git a/src/bookmarks/ephy-bookmarks-import.c b/src/bookmarks/ephy-bookmarks-import.c index 9182bed60..182f8b887 100644 --- a/src/bookmarks/ephy-bookmarks-import.c +++ b/src/bookmarks/ephy-bookmarks-import.c @@ -169,11 +169,8 @@ xbel_parse_folder (EphyBookmarks *bookmarks, child->children, keyword); - if (keyword) - { - g_free (keyword); - keyword = NULL; - } + g_free (keyword); + keyword = g_strdup (default_keyword); } child = child->next; @@ -193,23 +190,11 @@ xbel_parse_bookmarks (EphyBookmarks *bookmarks, while (child != NULL) { if (xmlStrEqual (child->name, "xbel")) - { - xbel_parse_bookmarks (bookmarks, - child->children, - default_keyword); - } - else if (xmlStrEqual (child->name, "folder")) { xbel_parse_folder (bookmarks, child->children, default_keyword); } - else if (xmlStrEqual (child->name, "bookmark")) - { - xbel_parse_folder (bookmarks, - child, - default_keyword); - } child = child->next; } -- cgit v1.2.3