Unify the location and favicon actions.

2005-01-08  Christian Persch  <chpe@cvs.gnome.org>

	* data/ui/epiphany-toolbar.xml:
	* lib/ephy-marshal.list:
	* lib/ephy-signal-accumulator.c: (ephy_signal_accumulator_string):
	* lib/ephy-signal-accumulator.h:
	* lib/widgets/ephy-location-entry.c:
	(ephy_location_entry_set_tooltip),
	(ephy_location_entry_class_init), (editable_changed_cb),
	(each_url_get_data_binder), (favicon_drag_data_get_cb),
	(ephy_location_entry_construct_contents),
	(ephy_location_entry_activate), (ephy_location_entry_get_entry),
	(ephy_location_entry_get_image):
	* lib/widgets/ephy-location-entry.h:
	* src/Makefile.am:
	* src/ephy-favicon-action.c:
	* src/ephy-favicon-action.h:
	* src/ephy-location-action.c: (sync_address), (sync_editable),
	(sync_icon), (get_location_cb), (get_title_cb),
	(remove_completion_actions), (add_completion_actions),
	(connect_proxy), (disconnect_proxy),
	(ephy_location_action_set_property),
	(ephy_location_action_get_property),
	(ephy_location_action_class_init), (ephy_location_action_init),
	(ephy_location_action_finalize):
	* src/ephy-window.c: (sync_tab_icon):
	* src/toolbar.c: (toolbar_setup_actions), (toolbar_update_favicon):
	* src/toolbar.h:

	Unify the location and favicon actions.

	* src/window-commands.c: (window_cmd_help_about):

	Add translator comment to the translation-credits string.

1 files changed, 10 insertions, 1 deletions

diff --git a/lib/widgets/ephy-location-entry.h b/lib/widgets/ephy-location-entry.h
index 08446b0d5..c4a44addc 100644
--- a/lib/widgets/ephy-location-entry.h
+++ b/lib/widgets/ephy-location-entry.h
@@ -25,6 +25,7 @@
 
 #include "ephy-node.h"
 
+#include <gtk/gtkwidget.h>
 #include <gtk/gtktoolitem.h>
 #include <gtk/gtktreemodel.h>
 
@@ -45,7 +46,11 @@ struct _EphyLocationEntryClass
 {
 	GtkToolItemClass parent_class;
 
-	void		(*user_changed)	(EphyLocationEntry *le);
+	/* Signals */
+	void	(*user_changed)	  (EphyLocationEntry *entry);
+	/* for getting the drag data */
+	char *	(* get_location)  (EphyLocationEntry *entry);
+	char *	(* get_title)     (EphyLocationEntry *entry);
 };
 
 struct _EphyLocationEntry
@@ -74,6 +79,10 @@ const char     *ephy_location_entry_get_location	(EphyLocationEntry *le);
 
 void		ephy_location_entry_activate		(EphyLocationEntry *le);
 
+GtkWidget      *ephy_location_entry_get_entry		(EphyLocationEntry *entry);
+
+GtkWidget      *ephy_location_entry_get_image		(EphyLocationEntry *entry);
+
 G_END_DECLS
 
 #endif