diff options
| author | Christian Persch <chpe@cvs.gnome.org> | 2004-08-23 20:08:01 +0800 |
|---|---|---|
| committer | Christian Persch <chpe@src.gnome.org> | 2004-08-23 20:08:01 +0800 |
| commit | b5a198b5d45ae6460919c4001a27574ff640ba27 (patch) | |
| tree | 45a45e66ef0451e8b60186f75ec89a333d1ba69f /src/bookmarks/ephy-bookmarks-import.c | |
| parent | d07a7cfd1903d727b888eeafd1858850ed467540 (diff) | |
| download | gsoc2013-epiphany-b5a198b5d45ae6460919c4001a27574ff640ba27.tar gsoc2013-epiphany-b5a198b5d45ae6460919c4001a27574ff640ba27.tar.gz gsoc2013-epiphany-b5a198b5d45ae6460919c4001a27574ff640ba27.tar.bz2 gsoc2013-epiphany-b5a198b5d45ae6460919c4001a27574ff640ba27.tar.lz gsoc2013-epiphany-b5a198b5d45ae6460919c4001a27574ff640ba27.tar.xz gsoc2013-epiphany-b5a198b5d45ae6460919c4001a27574ff640ba27.tar.zst gsoc2013-epiphany-b5a198b5d45ae6460919c4001a27574ff640ba27.zip | |
Make the hierarchy separator a #define.
2004-08-23 Christian Persch <chpe@cvs.gnome.org>
* src/bookmarks/ephy-bookmarks-editor.c: (cmd_bookmarks_import):
* src/bookmarks/ephy-bookmarks-import.c: (xbel_parse_folder),
(folders_list_to_topic_name):
* src/bookmarks/ephy-bookmarks.h:
Make the hierarchy separator a #define.
* src/bookmarks/ephy-bookmarks-menu.c: (remove_action),
(ephy_bookmarks_menu_clean), (open_bookmark_cb),
(add_action_for_bookmark), (ensure_bookmark_actions),
(create_menu), (create_submenu), (ephy_bookmarks_menu_rebuild),
(do_update_cb), (ephy_bookmarks_menu_maybe_update),
(ephy_bookmarks_menu_set_window),
(ephy_bookmarks_menu_set_property),
(ephy_bookmarks_menu_get_property), (bookmarks_tree_changed_cb),
(topics_added_cb), (topics_removed_cb), (topic_child_changed_cb),
(bookmark_added_cb), (bookmark_removed_cb), (activate_cb),
(ephy_bookmarks_menu_init), (ephy_bookmarks_menu_constructor),
(ephy_bookmarks_menu_finalize), (ephy_bookmarks_menu_class_init),
(ephy_bookmarks_menu_new):
* src/bookmarks/ephy-bookmarks-menu.h:
* src/bookmarks/ephy-bookmarks.c: (bookmarks_removed_cb),
(topics_removed_cb), (ephy_bookmarks_add):
Speed up bookmarks menu with large bookmarks collections, partially
fixes bug #141269.
Fix topic hierarchy and updating on changes, fixes bug #147470,
bug 147786, and bug #150246.
Diffstat (limited to 'src/bookmarks/ephy-bookmarks-import.c')
| -rw-r--r-- | src/bookmarks/ephy-bookmarks-import.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/bookmarks/ephy-bookmarks-import.c b/src/bookmarks/ephy-bookmarks-import.c index 9d5b0b19a..f41c882d5 100644 --- a/src/bookmarks/ephy-bookmarks-import.c +++ b/src/bookmarks/ephy-bookmarks-import.c @@ -1,6 +1,7 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ /* - * Copyright (C) 2003 Marco Pesenti Gritti + * Copyright (C) 2003, 2004 Marco Pesenti Gritti + * Copyright (C) 2003, 2004 Christian Persch * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -301,7 +302,8 @@ xbel_parse_folder (EphyBookmarks *eb, xmlTextReaderPtr reader, char *parent_fold } else { - folder = g_strconcat (parent_folder, "/", + folder = g_strconcat (parent_folder, + BOOKMARKS_HIERARCHY_SEP, title, NULL); } @@ -675,7 +677,7 @@ folders_list_to_topic_name (GList *folders) for (l = folders->next; l != NULL; l = l->next) { - g_string_append (topic, "/"); + g_string_append (topic, BOOKMARKS_HIERARCHY_SEP); g_string_append (topic, l->data); } |