Remove *_action_name functions, and use static buffers instead. Minor

2006-02-10  Christian Persch  <chpe@cvs.gnome.org>

	* 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.

1 files changed, 10 insertions, 14 deletions

diff --git a/src/bookmarks/ephy-bookmark-action.h b/src/bookmarks/ephy-bookmark-action.h
index ec77a353b..cb770f0b4 100644
--- a/src/bookmarks/ephy-bookmark-action.h
+++ b/src/bookmarks/ephy-bookmark-action.h
@@ -37,9 +37,6 @@ G_BEGIN_DECLS
 #define EPHY_IS_BOOKMARK_ACTION_CLASS(klass)	(G_TYPE_CHECK_CLASS_TYPE ((obj), EPHY_TYPE_BOOKMARK_ACTION))
 #define EPHY_BOOKMARK_ACTION_GET_CLASS(obj)	(G_TYPE_INSTANCE_GET_CLASS((obj), EPHY_TYPE_BOOKMARK_ACTION, EphyBookmarkActionClass))
 
-#define EPHY_BOOKMARK_ACTION_NAME_BUFFER_SIZE		32 /* >= strlen ("Bmk") + max size of gulong + 1 */
-#define EPHY_BOOKMARK_ACTION_NAME_PRINTF(buffer,node)	(g_snprintf (buffer, sizeof (buffer), "Bmk%u", ephy_node_get_id (node)))
-
 typedef struct _EphyBookmarkAction		EphyBookmarkAction;
 typedef struct _EphyBookmarkActionPrivate	EphyBookmarkActionPrivate;
 typedef struct _EphyBookmarkActionClass		EphyBookmarkActionClass;
@@ -58,22 +55,21 @@ struct _EphyBookmarkActionClass
 };
 
 
-GType       ephy_bookmark_action_get_type (void);
-
-char *      ephy_bookmark_action_name     (EphyNode *node);
-
-GtkAction * ephy_bookmark_action_new      (EphyNode *node, char *name);
+GType		ephy_bookmark_action_get_type		(void);
 
+GtkAction      *ephy_bookmark_action_new		(EphyNode *node,
+							 const char *name);
 
-void        ephy_bookmark_action_set_bookmark (EphyBookmarkAction *action, EphyNode *node);
+void		ephy_bookmark_action_set_bookmark	(EphyBookmarkAction *action,
+		 					 EphyNode *node);
 
-EphyNode *  ephy_bookmark_action_get_bookmark (EphyBookmarkAction *action);
+EphyNode       *ephy_bookmark_action_get_bookmark	(EphyBookmarkAction *action);
 
-void        ephy_bookmark_action_updated      (EphyBookmarkAction *action);
+void		ephy_bookmark_action_updated		(EphyBookmarkAction *action);
 
-void        ephy_bookmark_action_activate     (EphyBookmarkAction *action,
-					       GtkWidget *widget,
-					       EphyLinkFlags flags);
+void		ephy_bookmark_action_activate		(EphyBookmarkAction *action,
+							 GtkWidget *widget,
+							 EphyLinkFlags flags);
 
 G_END_DECLS