From 927100b2cb4b488d2581d63f764b74db976db69c Mon Sep 17 00:00:00 2001 From: Christian Persch Date: Fri, 10 Feb 2006 22:49:29 +0000 Subject: Remove *_action_name functions, and use static buffers instead. Minor 2006-02-10 Christian Persch * src/bookmarks/ephy-bookmark-action-group.c: (smart_added_cb), (smart_removed_cb), (node_changed_cb), (node_added_cb), (node_removed_cb): * src/bookmarks/ephy-bookmark-action.c: (ephy_bookmark_action_new): * src/bookmarks/ephy-bookmark-action.h: * src/bookmarks/ephy-bookmark-factory-action.c: (build_menu_for_topic): * src/bookmarks/ephy-bookmarks-editor.c: (cmd_toolbar), (ephy_bookmarks_editor_update_menu): * src/bookmarks/ephy-bookmarks-menu.c: (append_bookmarks), (append_menu), (ephy_bookmarks_menu_build): * src/bookmarks/ephy-bookmarks-ui.c: (ephy_bookmarks_ui_attach_window), (topic_has_data), (topic_get_data), (topic_get_name), (bookmark_has_data), (bookmark_get_data), (bookmark_get_name), (bookmark_new_name), (toolbar_node_removed_cb): * src/bookmarks/ephy-bookmarks-ui.h: * src/bookmarks/ephy-open-tabs-action.c: (node_added_cb), (node_removed_cb), (ephy_open_tabs_group_new): * src/bookmarks/ephy-open-tabs-action.h: * src/bookmarks/ephy-topic-action-group.c: (node_changed_cb), (node_added_cb), (node_removed_cb), (ephy_topic_action_group_new): * src/bookmarks/ephy-topic-action-group.h: * src/bookmarks/ephy-topic-action.c: (ephy_topic_action_new): * src/bookmarks/ephy-topic-action.h: * src/bookmarks/ephy-topic-factory-action.c: (build_menu): Remove *_action_name functions, and use static buffers instead. Minor cleanups. --- src/bookmarks/ephy-bookmark-factory-action.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'src/bookmarks/ephy-bookmark-factory-action.c') diff --git a/src/bookmarks/ephy-bookmark-factory-action.c b/src/bookmarks/ephy-bookmark-factory-action.c index 2547c8b8f..43c4683a0 100644 --- a/src/bookmarks/ephy-bookmark-factory-action.c +++ b/src/bookmarks/ephy-bookmark-factory-action.c @@ -25,6 +25,7 @@ #include "ephy-bookmark-factory-action.h" #include "ephy-bookmark-action.h" +#include "ephy-bookmarks-ui.h" #include "ephy-node-common.h" #include "ephy-shell.h" #include "ephy-stock-icons.h" @@ -97,7 +98,8 @@ build_menu_for_topic (GtkWidget *placeholder, EggToolbarsModel *model, EphyNode GtkWidget *menu, *item; EphyNode *node; GPtrArray *children, *bookmarks; - const char *name, *action; + const char *name; + char action[EPHY_BOOKMARK_ACTION_NAME_BUFFER_SIZE]; gint i, flags; children = ephy_node_get_children (topic); @@ -112,10 +114,11 @@ build_menu_for_topic (GtkWidget *placeholder, EggToolbarsModel *model, EphyNode { node = g_ptr_array_index (bookmarks, i); - action = ephy_bookmark_action_name (node); + EPHY_BOOKMARK_ACTION_NAME_PRINTF (action, node); + flags = egg_toolbars_model_get_name_flags (model, action); if (flags & EGG_TB_MODEL_NAME_USED) - continue; + continue; name = ephy_node_get_property_string (node, EPHY_NODE_BMK_PROP_TITLE); item = gtk_menu_item_new_with_label (name); -- cgit v1.2.3