Do not install two copies of epiphany.png

2003-04-18  Marco Pesenti Gritti  <marco@it.gnome.org>

	* data/art/Makefile.am:

	Do not install two copies of epiphany.png

	* embed/ephy-history.c: (ephy_history_save),
	(ephy_history_set_page_title):

	Use host name as title for sites, not the real
	title.

	* lib/ephy-state.c: (ephy_state_add_window),
	(paned_size_allocate_cb), (ephy_state_add_paned):
	* lib/ephy-state.h:

	Add a way to persist paned.

	* lib/widgets/ephy-node-view.h:
	* lib/widgets/ephy-node-view.c: (ephy_node_view_sort_func),
	(provide_text_weight), (ephy_node_view_add_column),
	(ephy_node_view_has_selection):

	Improve add_column api a bit to support both auto sorting
	and user sorting.

	* src/bookmarks/ephy-bookmarks-editor.c:
	(ephy_bookmarks_editor_construct):

	Updates for changed api.

	* src/ephy-history-window.c: (ephy_history_window_construct):

	Set a max size for title/location. Not very good, but the
	best we can do with current treeview api prolly.
	Persist the paned size.
	Make columns user sortable.

1 files changed, 1 insertions, 32 deletions

diff --git a/embed/ephy-history.c b/embed/ephy-history.c
index 056d04c13..3bb69db7f 100644
--- a/embed/ephy-history.c
+++ b/embed/ephy-history.c
@@ -287,6 +287,7 @@ ephy_history_save (EphyHistory *eb)
 		EphyNode *kid;
 
 		kid = g_ptr_array_index (children, i);
+		if (kid == eb->priv->pages) continue;
 
 		ephy_node_save_to_xml (kid, root);
 	}
@@ -487,33 +488,6 @@ ephy_history_new ()
 }
 
 static void
-ephy_history_host_set_title (EphyHistory *eh,
-			     EphyNode *host,
-			     EphyNode *page,
-			     const char *title)
-{
-	const char *real_url;
-	const char *host_url;
-	GValue value = { 0, };
-
-	real_url = ephy_node_get_property_string
-		(page, EPHY_NODE_PAGE_PROP_LOCATION);
-	host_url = ephy_node_get_property_string
-		(host, EPHY_NODE_PAGE_PROP_LOCATION);
-
-	if (real_url && host_url &&
-	    strcmp (real_url, host_url) == 0)
-	{
-
-		g_value_init (&value, G_TYPE_STRING);
-		g_value_set_string (&value, title);
-		ephy_node_set_property (host, EPHY_NODE_PAGE_PROP_TITLE,
-					&value);
-		g_value_unset (&value);
-	}
-}
-
-static void
 ephy_history_host_visited (EphyHistory *eh,
 			   EphyNode *host,
 			   GTime now)
@@ -800,11 +774,6 @@ ephy_history_set_page_title (EphyHistory *gh,
 
 	host_id = ephy_node_get_property_int
 		(node, EPHY_NODE_PAGE_PROP_HOST_ID);
-	if (host_id >= 0)
-	{
-		ephy_history_host_set_title (gh, ephy_node_get_from_id  (host_id),
-					     node, title);
-	}
 }
 
 void