aboutsummaryrefslogtreecommitdiffstats
path: root/src/bookmarks
diff options
context:
space:
mode:
authorJames Willcox <jwillcox@gnome.org>2003-02-06 12:12:00 +0800
committerJames Willcox <jwillcox@src.gnome.org>2003-02-06 12:12:00 +0800
commit22b5564396f1f0bb07ec810e3238697edf62564e (patch)
tree647ea442f2a33bb8f36b334d4a5e338f945e2fdf /src/bookmarks
parenta5db253e80f45304855e99c98447aa76f86b648c (diff)
downloadgsoc2013-epiphany-22b5564396f1f0bb07ec810e3238697edf62564e.tar
gsoc2013-epiphany-22b5564396f1f0bb07ec810e3238697edf62564e.tar.gz
gsoc2013-epiphany-22b5564396f1f0bb07ec810e3238697edf62564e.tar.bz2
gsoc2013-epiphany-22b5564396f1f0bb07ec810e3238697edf62564e.tar.lz
gsoc2013-epiphany-22b5564396f1f0bb07ec810e3238697edf62564e.tar.xz
gsoc2013-epiphany-22b5564396f1f0bb07ec810e3238697edf62564e.tar.zst
gsoc2013-epiphany-22b5564396f1f0bb07ec810e3238697edf62564e.zip
Make importing actually work properly. *cough*
2003-02-05 James Willcox <jwillcox@gnome.org> * src/bookmarks/ephy-bookmarks-import.c: (xbel_parse_folder), (xbel_parse_bookmarks): Make importing actually work properly. *cough*
Diffstat (limited to 'src/bookmarks')
-rw-r--r--src/bookmarks/ephy-bookmarks-import.c19
1 files changed, 2 insertions, 17 deletions
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;
@@ -194,22 +191,10 @@ xbel_parse_bookmarks (EphyBookmarks *bookmarks,
{
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;
}