Update

2003-05-11  Marco Pesenti Gritti  <marco@it.gnome.org>

	* lib/egg/egg-action.c:
	* lib/egg/eggseparatortoolitem.c:
	* lib/egg/eggtoggletoolbutton.c:
	* lib/egg/eggtoolbar.c:
	* lib/egg/eggtoolbutton.c:
	* lib/egg/eggtoolitem.c:
	* lib/egg/eggtoolitem.h:

	Update

	* src/bookmarks/Makefile.am:
	* src/bookmarks/ephy-bookmarks.c:
	* src/bookmarks/ephy-bookmarks-export.c:
	* src/bookmarks/ephy-bookmarks-export.h:

	Export bookmarks in an rdf format (RSS was perfect,
	so I just used it instead of inventing a new one).
	This is useful to ensure compatibility in case
	of database formats changes. It will be used also
	as import format for ephy. Also I think it can be easily
	displayed, need to talk with Edd about the css url though.

	Thanks to Edd Dumbill for the help with this.

1 files changed, 34 insertions, 24 deletions

diff --git a/lib/egg/eggtoolitem.h b/lib/egg/eggtoolitem.h
index f25ffae89..20f03526b 100644
--- a/lib/egg/eggtoolitem.h
+++ b/lib/egg/eggtoolitem.h
@@ -24,6 +24,7 @@
 
 #include <gtk/gtkbin.h>
 #include <gtk/gtktooltips.h>
+#include <gtk/gtkmenuitem.h>
 
 #define EGG_TYPE_TOOL_ITEM            (egg_tool_item_get_type ())
 #define EGG_TOOL_ITEM(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), EGG_TYPE_TOOL_ITEM, EggToolItem))
@@ -51,13 +52,16 @@ struct _EggToolItem
   guint pack_end : 1;
   guint use_drag_window : 1;
   guint overflow_item : 1;
+
+  GtkWidget *menu_item;
+  gchar *menu_item_id;
 };
 
 struct _EggToolItemClass
 {
   GtkBinClass parent_class;
 
-  GtkWidget *(* create_menu_proxy)   (EggToolItem    *tool_item);
+  gboolean   (* create_menu_proxy) (EggToolItem  *tool_item);
   void       (* toolbar_reconfigured) (EggToolItem   *tool_item);
   void	     (* set_tooltip)	     (EggToolItem    *tool_item,
 				      GtkTooltips    *tooltips,
@@ -68,29 +72,35 @@ struct _EggToolItemClass
 GType        egg_tool_item_get_type (void);
 EggToolItem *egg_tool_item_new      (void);
 
-void            egg_tool_item_toolbar_reconfigured   (EggToolItem     *tool_item);
-void            egg_tool_item_set_homogeneous        (EggToolItem     *tool_item,
-						      gboolean         homogeneous);
-void            egg_tool_item_set_expand             (EggToolItem     *tool_item,
-						      gboolean         expand);
-void            egg_tool_item_set_pack_end           (EggToolItem     *tool_item,
-						      gboolean         pack_end);
-void            egg_tool_item_set_tooltip            (EggToolItem     *tool_item,
-						      GtkTooltips     *tooltips,
-						      const gchar     *tip_text,
-						      const gchar     *tip_private);
-void            egg_tool_item_set_use_drag_window    (EggToolItem     *toolitem,
-						      gboolean         use_drag_window);
-void            egg_tool_item_set_visible_horizontal (EggToolItem     *toolitem,
-						      gboolean         visible_horizontal);
-gboolean        egg_tool_item_get_visible_horizontal (EggToolItem     *toolitem);
-void            egg_tool_item_set_visible_vertical   (EggToolItem     *toolitem,
-						      gboolean         visible_horizontal);
-gboolean        egg_tool_item_get_visible_vertical   (EggToolItem     *toolitem);
-GtkIconSize     egg_tool_item_get_icon_size          (EggToolItem     *tool_item);
-GtkOrientation  egg_tool_item_get_orientation        (EggToolItem     *tool_item);
-GtkToolbarStyle egg_tool_item_get_toolbar_style      (EggToolItem     *tool_item);
-GtkReliefStyle  egg_tool_item_get_relief_style       (EggToolItem     *tool_item);
+void            egg_tool_item_toolbar_reconfigured     (EggToolItem *tool_item);
+void            egg_tool_item_set_homogeneous          (EggToolItem *tool_item,
+							gboolean     homogeneous);
+void            egg_tool_item_set_expand               (EggToolItem *tool_item,
+							gboolean     expand);
+void            egg_tool_item_set_pack_end             (EggToolItem *tool_item,
+							gboolean     pack_end);
+void            egg_tool_item_set_tooltip              (EggToolItem *tool_item,
+							GtkTooltips *tooltips,
+							const gchar *tip_text,
+							const gchar *tip_private);
+void            egg_tool_item_set_use_drag_window      (EggToolItem *toolitem,
+							gboolean     use_drag_window);
+void            egg_tool_item_set_visible_horizontal   (EggToolItem *toolitem,
+							gboolean     visible_horizontal);
+gboolean        egg_tool_item_get_visible_horizontal   (EggToolItem *toolitem);
+void            egg_tool_item_set_visible_vertical     (EggToolItem *toolitem,
+							gboolean     visible_horizontal);
+gboolean        egg_tool_item_get_visible_vertical     (EggToolItem *toolitem);
+GtkIconSize     egg_tool_item_get_icon_size            (EggToolItem *tool_item);
+GtkOrientation  egg_tool_item_get_orientation          (EggToolItem *tool_item);
+GtkToolbarStyle egg_tool_item_get_toolbar_style        (EggToolItem *tool_item);
+GtkReliefStyle  egg_tool_item_get_relief_style         (EggToolItem *tool_item);
+GtkWidget *     egg_tool_item_retrieve_proxy_menu_item (EggToolItem *tool_item);
+GtkWidget *     egg_tool_item_get_proxy_menu_item      (EggToolItem *tool_item,
+							const gchar *menu_item_id);
+void            egg_tool_item_set_proxy_menu_item      (EggToolItem *tool_item,
+							const gchar *menu_item_id,
+							GtkWidget   *menu_item);
 
 
 #endif /* __EGG_TOOL_ITEM_H__ */