Complete (or nearly) toolbar editor implementation. Bookmarks are

2003-01-29  Marco Pesenti Gritti  <marco@it.gnome.org>

	* lib/ephy-bonobo-extensions.c: (ephy_bonobo_clear_path),
	(ephy_bonobo_replace_path):
	* lib/ephy-bonobo-extensions.h:
	* lib/ephy-marshal.list:
	* lib/ephy-string.c: (ephy_str_to_int):
	* lib/ephy-string.h:
	* lib/widgets/ephy-editable-toolbar.c: (impl_get_action),
	(add_action), (parse_item_list), (add_toolbar), (parse_toolbars),
	(load_defaults), (load_toolbar), (drag_data_received_cb),
	(setup_toolbar_drag), (ensure_toolbars_min_size), (do_merge),
	(ephy_editable_toolbar_class_init), (editor_get_dimensions),
	(hide_editor), (editor_close_cb), (editor_add_toolbar_cb),
	(editor_drag_data_received_cb), (editor_drag_data_delete_cb),
	(setup_editor), (button_press_cb), (show_editor),
	(ephy_editable_toolbar_edit), (ephy_editable_toolbar_get_action):
	* lib/widgets/ephy-editable-toolbar.h:
	* src/bookmarks/ephy-bookmarks.c: (ephy_bookmarks_get_bookmark_id):
	* src/bookmarks/ephy-bookmarks.h:
	* src/session.c: (session_load):
	* src/toolbar.c: (go_location_cb), (toolbar_get_action),
	(toolbar_class_init), (toolbar_init):

	Complete (or nearly) toolbar editor implementation.
	Bookmarks are implemented too, but some minor problems
	are stopping them to work.

1 files changed, 13 insertions, 5 deletions

diff --git a/lib/widgets/ephy-editable-toolbar.h b/lib/widgets/ephy-editable-toolbar.h
index 6ece8d4c5..10d633a50 100755
--- a/lib/widgets/ephy-editable-toolbar.h
+++ b/lib/widgets/ephy-editable-toolbar.h
@@ -32,6 +32,8 @@ typedef struct EphyEditableToolbarClass EphyEditableToolbarClass;
 #define EPHY_EDITABLE_TOOLBAR_CLASS(klass)     (G_TYPE_CHECK_CLASS_CAST ((klass), EPHY_EDITABLE_TOOLBAR_TYPE, EphyEditableToolbarClass))
 #define IS_EPHY_EDITABLE_TOOLBAR(obj)          (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EPHY_EDITABLE_TOOLBAR_TYPE))
 #define IS_EPHY_EDITABLE_TOOLBAR_CLASS(klass)  (G_TYPE_CHECK_CLASS_TYPE ((klass), EPHY_EDITABLE_TOOLBAR_TYPE))
+#define EPHY_EDITABLE_TOOLBAR_GET_CLASS(obj)   (G_TYPE_INSTANCE_GET_CLASS ((obj), EPHY_EDITABLE_TOOLBAR_TYPE, EphyEditableToolbarClass))
+
 
 typedef struct EphyEditableToolbar EphyEditableToolbar;
 typedef struct EphyEditableToolbarPrivate EphyEditableToolbarPrivate;
@@ -46,15 +48,21 @@ struct EphyEditableToolbarClass
 {
         GObjectClass parent_class;
 
-	void (* request_action) (EphyEditableToolbar *etoolbar,
-				 const char *action_name);
+	EggAction * (* get_action) (EphyEditableToolbar *etoolbar,
+				    const char *type,
+				    const char *name);
 };
 
-GType			ephy_editable_toolbar_get_type	(void);
+GType			ephy_editable_toolbar_get_type	 (void);
+
+EphyEditableToolbar    *ephy_editable_toolbar_new	 (EggMenuMerge *merge);
+
+void			ephy_editable_toolbar_edit	 (EphyEditableToolbar *etoolbar);
 
-EphyEditableToolbar    *ephy_editable_toolbar_new	(EggMenuMerge *merge);
+EggAction              *ephy_editable_toolbar_get_action (EphyEditableToolbar *etoolbar,
+							  const char *type,
+							  const char *name);
 
-void			ephy_editable_toolbar_edit	(EphyEditableToolbar *etoolbar);
 
 G_END_DECLS