Unify bookmarks/smart bookmarks address resolution, and add a signal to

2005-07-26  Christian Persch  <chpe@cvs.gnome.org>

	* lib/ephy-marshal.list:
	* src/bookmarks/ephy-bookmark-action.c: (open_in_tab_activate_cb),
	(open_in_window_activate_cb), (activate_cb):
	* src/bookmarks/ephy-bookmarks.c: (ephy_bookmarks_class_init),
	(impl_resolve_address), (ephy_bookmarks_resolve_address):
	* src/bookmarks/ephy-bookmarks.h:
	* src/bookmarks/ephy-topic-action.c: (menu_activate_cb),
	(open_in_tabs_activate_cb):
	* src/ephy-location-action.c: (action_activated_cb),
	(entry_activate_cb):
	* src/epiphany.defs:

	Unify bookmarks/smart bookmarks address resolution, and add a signal
	to EphyBookmarks for it.

1 files changed, 6 insertions, 3 deletions

diff --git a/src/bookmarks/ephy-bookmarks.h b/src/bookmarks/ephy-bookmarks.h
index 64073a211..cae6b82ba 100644
--- a/src/bookmarks/ephy-bookmarks.h
+++ b/src/bookmarks/ephy-bookmarks.h
@@ -66,6 +66,9 @@ struct _EphyBookmarksClass
 	GObjectClass parent_class;
 
 	void	(* tree_changed)	(EphyBookmarks *eb);
+	char *	(* resolve_address)	(EphyBookmarks *eb,
+					 const char *address,
+					 const char *argument);
 };
 
 GType		  ephy_bookmarks_get_type		(void);
@@ -94,9 +97,9 @@ void		  ephy_bookmarks_set_address    	(EphyBookmarks *eb,
 							 EphyNode *bookmark,
 							 const char *address);
 
-char		 *ephy_bookmarks_solve_smart_url	 (EphyBookmarks *eb,
-							 const char *smart_url,
-							 const char *content);
+char		 *ephy_bookmarks_resolve_address	(EphyBookmarks *eb,
+							 const char *address,
+							 const char *parameter);
 
 guint		ephy_bookmarks_get_smart_bookmark_width (EphyNode *bookmark);