From b5a198b5d45ae6460919c4001a27574ff640ba27 Mon Sep 17 00:00:00 2001 From: Christian Persch Date: Mon, 23 Aug 2004 12:08:01 +0000 Subject: Make the hierarchy separator a #define. 2004-08-23 Christian Persch * 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. --- src/bookmarks/ephy-bookmarks-menu.h | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) (limited to 'src/bookmarks/ephy-bookmarks-menu.h') diff --git a/src/bookmarks/ephy-bookmarks-menu.h b/src/bookmarks/ephy-bookmarks-menu.h index a17797923..890b388fe 100644 --- a/src/bookmarks/ephy-bookmarks-menu.h +++ b/src/bookmarks/ephy-bookmarks-menu.h @@ -23,15 +23,7 @@ #include "ephy-window.h" -/* object forward declarations */ - -typedef struct _EphyBookmarksMenu EphyBookmarksMenu; -typedef struct _EphyBookmarksMenuClass EphyBookmarksMenuClass; -typedef struct _EphyBookmarksMenuPrivate EphyBookmarksMenuPrivate; - -/** - * Editor object - */ +G_BEGIN_DECLS #define EPHY_TYPE_BOOKMARKS_MENU (ephy_bookmarks_menu_get_type()) #define EPHY_BOOKMARKS_MENU(object) (G_TYPE_CHECK_INSTANCE_CAST((object), EPHY_TYPE_BOOKMARKS_MENU, EphyBookmarksMenu)) @@ -40,6 +32,10 @@ typedef struct _EphyBookmarksMenuPrivate EphyBookmarksMenuPrivate; #define EPHY_IS_BOOKMARKS_MENU_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), EPHY_TYPE_BOOKMARKS_MENU)) #define EPHY_BOOKMARKS_MENU_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), EPHY_TYPE_BOOKMARKS_MENU, EphyBookmarksMenuClass)) +typedef struct _EphyBookmarksMenu EphyBookmarksMenu; +typedef struct _EphyBookmarksMenuClass EphyBookmarksMenuClass; +typedef struct _EphyBookmarksMenuPrivate EphyBookmarksMenuPrivate; + struct _EphyBookmarksMenuClass { GObjectClass parent_class; @@ -57,5 +53,6 @@ GType ephy_bookmarks_menu_get_type (void); EphyBookmarksMenu *ephy_bookmarks_menu_new (EphyWindow *window); -#endif +G_END_DECLS +#endif -- cgit v1.2.3