From 6c217beb4ac1ec20a3f5407714efcb16020811fd Mon Sep 17 00:00:00 2001 From: Christian Persch Date: Fri, 6 Jun 2003 07:13:55 +0000 Subject: Fix signed/unsigned mistake, speed up favorites menu building 2003-06-06 Christian Persch * src/bookmarks/ephy-bookmarks-menu.c: (ephy_bookmarks_menu_clean), (ephy_bookmarks_menu_rebuild), (ephy_bookmarks_menu_init): * src/ephy-favorites-menu.c: (ephy_favorites_menu_clean), (ephy_favorites_menu_rebuild), (ephy_favorites_menu_init): Fix signed/unsigned mistake, speed up favorites menu building --- src/bookmarks/ephy-bookmarks-menu.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'src/bookmarks/ephy-bookmarks-menu.c') diff --git a/src/bookmarks/ephy-bookmarks-menu.c b/src/bookmarks/ephy-bookmarks-menu.c index 4182f125e..da186741e 100644 --- a/src/bookmarks/ephy-bookmarks-menu.c +++ b/src/bookmarks/ephy-bookmarks-menu.c @@ -93,10 +93,11 @@ ephy_bookmarks_menu_clean (EphyBookmarksMenu *menu) EphyBookmarksMenuPrivate *p = menu->priv; EggMenuMerge *merge = EGG_MENU_MERGE (p->window->ui_merge); - if (p->ui_id >= 0) + if (p->ui_id > 0) { egg_menu_merge_remove_ui (merge, p->ui_id); egg_menu_merge_ensure_update (merge); + p->ui_id = 0; } if (p->action_group != NULL) @@ -248,7 +249,9 @@ ephy_bookmarks_menu_rebuild (EphyBookmarksMenu *menu) GList *node_list = NULL, *l; EggAction *empty; - LOG ("Rebuilding recent history menu") + LOG ("Rebuilding bookmarks menu") + + START_PROFILER ("Rebuilding bookmarks menu") ephy_bookmarks_menu_clean (menu); @@ -340,6 +343,8 @@ ephy_bookmarks_menu_rebuild (EphyBookmarksMenu *menu) g_string_free (xml, TRUE); g_list_free (node_list); + + STOP_PROFILER ("Rebuilding bookmarks menu") } static void @@ -427,7 +432,7 @@ ephy_bookmarks_menu_init (EphyBookmarksMenu *menu) G_CALLBACK (bookmarks_tree_changed_cb), menu); - menu->priv->ui_id = -1; + menu->priv->ui_id = 0; menu->priv->action_group = NULL; menu->priv->update_tag = 0; } -- cgit v1.2.3