Use favicons in bookmarks. Use titles for session history when possible.

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

	* TODO:
	* embed/ephy-favicon-cache.c: (ephy_favicon_cache_get):
	* src/bookmarks/ephy-bookmarks-editor.c:
	(ephy_bookmarks_editor_construct):
	* src/bookmarks/ephy-bookmarks.c: (ephy_bookmarks_set_icon):
	* src/bookmarks/ephy-bookmarks.h:
	* src/bookmarks/ephy-new-bookmark.c: (ephy_new_bookmark_finalize),
	(ephy_new_bookmark_add), (ephy_new_bookmark_init),
	(ephy_new_bookmark_set_smarturl), (ephy_new_bookmark_set_icon):
	* src/bookmarks/ephy-new-bookmark.h:
	* src/bookmarks/ephy-node-view.c: (ephy_node_view_add_column),
	(ephy_node_view_add_icon_column):
	* src/bookmarks/ephy-node-view.h:
	* src/bookmarks/ephy-tree-model-node.c:
	(ephy_tree_model_node_get_column_type), (get_icon_pixbuf),
	(ephy_tree_model_node_get_value),
	(ephy_tree_model_node_column_get_type):
	* src/bookmarks/ephy-tree-model-node.h:
	* src/ephy-history-model.c: (ephy_history_model_get_value):
	* src/ephy-navigation-button.c: (setup_back_or_forward_menu):
	* src/ephy-tab.c: (ephy_tab_favicon_cb):
	* src/window-commands.c: (window_cmd_bookmarks_add_default):

	Use favicons in bookmarks.
	Use titles for session history when possible.

1 files changed, 18 insertions, 0 deletions

diff --git a/src/bookmarks/ephy-new-bookmark.c b/src/bookmarks/ephy-new-bookmark.c
index dbda8b11b..de3cdbe80 100644
--- a/src/bookmarks/ephy-new-bookmark.c
+++ b/src/bookmarks/ephy-new-bookmark.c
@@ -47,6 +47,7 @@ struct EphyNewBookmarkPrivate
 	EphyBookmarks *bookmarks;
 	char *location;
 	char *smarturl;
+	char *icon;
 
 	GtkWidget *title_entry;
 	GtkWidget *keywords_entry;
@@ -131,6 +132,7 @@ ephy_new_bookmark_finalize (GObject *object)
 
 	g_free (editor->priv->location);
 	g_free (editor->priv->smarturl);
+	g_free (editor->priv->icon);
 
 	g_free (editor->priv);
 
@@ -150,6 +152,13 @@ ephy_new_bookmark_add (EphyNewBookmark *new_bookmark)
 	ephy_bookmarks_add (new_bookmark->priv->bookmarks, title,
 			    new_bookmark->priv->location,
 			    new_bookmark->priv->smarturl, keywords);
+
+	if (new_bookmark->priv->icon)
+	{
+		ephy_bookmarks_set_icon (new_bookmark->priv->bookmarks,
+					 new_bookmark->priv->location,
+					 new_bookmark->priv->icon);
+	}
 }
 
 static void
@@ -324,6 +333,7 @@ ephy_new_bookmark_init (EphyNewBookmark *editor)
 	editor->priv = g_new0 (EphyNewBookmarkPrivate, 1);
 	editor->priv->location = NULL;
 	editor->priv->smarturl = NULL;
+	editor->priv->icon = NULL;
 }
 
 void
@@ -343,3 +353,11 @@ ephy_new_bookmark_set_smarturl (EphyNewBookmark *bookmark,
 	bookmark->priv->smarturl = g_strdup (url);
 }
 
+void
+ephy_new_bookmark_set_icon (EphyNewBookmark *bookmark,
+			    const char *icon)
+{
+	g_free (bookmark->priv->icon);
+	bookmark->priv->icon = icon ? g_strdup (icon) : NULL;
+}
+