New abstracted implementations. Nicer and will be useful for history

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

	* lib/widgets/Makefile.am:
	* lib/widgets/ephy-node-view.c:
	* lib/widgets/ephy-node-view.h:
	* lib/widgets/ephy-tree-model-node.c:
	* lib/widgets/ephy-tree-model-node.h:

	New abstracted implementations.
	Nicer and will be useful for
	history dialog interface rehash to make
	it more consistent with bookmarks (this
	was the hard part of the work).

	* src/bookmarks/Makefile.am:
	* src/bookmarks/ephy-bookmarks-editor.c:

	Use them.

	* src/history-dialog.c:

	Temp hack to keep the thing building until
	I actually rewrite history dialog.

2

1 files changed, 0 insertions, 752 deletions

diff --git a/src/bookmarks/ephy-tree-model-node.c b/src/bookmarks/ephy-tree-model-node.c
deleted file mode 100644
index bca22c379..000000000
--- a/src/bookmarks/ephy-tree-model-node.c
+++ /dev/null
@@ -1,752 +0,0 @@
-/* 
- *  Copyright (C) 2002 Jorn Baayen <jorn@nl.linux.org>
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- *
- *  $Id$
- */
-
-#include <config.h>
-#include <gtk/gtktreeview.h>
-#include <gdk-pixbuf/gdk-pixbuf.h>
-#include <libgnome/gnome-i18n.h>
-#include <time.h>
-#include <string.h>
-
-#include "ephy-node-filter.h"
-#include "ephy-bookmarks.h"
-#include "ephy-tree-model-node.h"
-#include "ephy-stock-icons.h"
-#include "ephy-node.h"
-#include "ephy-shell.h"
-#include "ephy-debug.h"
-
-static void ephy_tree_model_node_class_init (EphyTreeModelNodeClass *klass);
-static void ephy_tree_model_node_init (EphyTreeModelNode *model);
-static void ephy_tree_model_node_finalize (GObject *object);
-static void ephy_tree_model_node_set_property (GObject *object,
-					       guint prop_id,
-					       const GValue *value,
-					       GParamSpec *pspec);
-static void ephy_tree_model_node_get_property (GObject *object,
-					       guint prop_id,
-					       GValue *value,
-					       GParamSpec *pspec);
-static guint ephy_tree_model_node_get_flags (GtkTreeModel *tree_model);
-static int ephy_tree_model_node_get_n_columns (GtkTreeModel *tree_model);
-static GType ephy_tree_model_node_get_column_type (GtkTreeModel *tree_model,
-						   int index);
-static gboolean ephy_tree_model_node_get_iter (GtkTreeModel *tree_model,
-					       GtkTreeIter *iter,
-					       GtkTreePath *path);
-static GtkTreePath *ephy_tree_model_node_get_path (GtkTreeModel *tree_model,
-						   GtkTreeIter *iter);
-static void ephy_tree_model_node_get_value (GtkTreeModel *tree_model,
-					    GtkTreeIter *iter,
-					    int column,
-					    GValue *value);
-static gboolean	ephy_tree_model_node_iter_next (GtkTreeModel *tree_model,
-					        GtkTreeIter *iter);
-static gboolean	ephy_tree_model_node_iter_children (GtkTreeModel *tree_model,
-						    GtkTreeIter *iter,
-						    GtkTreeIter *parent);
-static gboolean	ephy_tree_model_node_iter_has_child (GtkTreeModel *tree_model,
-						     GtkTreeIter *iter);
-static int ephy_tree_model_node_iter_n_children (GtkTreeModel *tree_model,
-					         GtkTreeIter *iter);
-static gboolean	ephy_tree_model_node_iter_nth_child (GtkTreeModel *tree_model,
-						     GtkTreeIter *iter,
-						     GtkTreeIter *parent,
-					             int n);
-static gboolean	ephy_tree_model_node_iter_parent (GtkTreeModel *tree_model,
-					          GtkTreeIter *iter,
-					          GtkTreeIter *child);
-static void ephy_tree_model_node_tree_model_init (GtkTreeModelIface *iface);
-static void root_child_removed_cb (EphyNode *node,
-				   EphyNode *child,
-				   EphyTreeModelNode *model);
-static void root_child_added_cb (EphyNode *node,
-				 EphyNode *child,
-				 EphyTreeModelNode *model);
-static void root_child_changed_cb (EphyNode *node,
-				   EphyNode *child,
-		                   EphyTreeModelNode *model);
-static inline void ephy_tree_model_node_update_node (EphyTreeModelNode *model,
-				                     EphyNode *node,
-					             int idx);
-static void root_destroyed_cb (EphyNode *node,
-		               EphyTreeModelNode *model);
-static inline GtkTreePath *get_path_real (EphyTreeModelNode *model,
-	                                  EphyNode *node);
-
-struct EphyTreeModelNodePrivate
-{
-	EphyNode *root;
-
-	EphyNodeFilter *filter;
-};
-
-enum
-{
-	PROP_0,
-	PROP_ROOT,
-	PROP_FILTER
-};
-
-static GObjectClass *parent_class = NULL;
-
-GType
-ephy_tree_model_node_get_type (void)
-{
-	static GType ephy_tree_model_node_type = 0;
-
-	if (ephy_tree_model_node_type == 0)
-	{
-		static const GTypeInfo our_info =
-		{
-			sizeof (EphyTreeModelNodeClass),
-			NULL,
-			NULL,
-			(GClassInitFunc) ephy_tree_model_node_class_init,
-			NULL,
-			NULL,
-			sizeof (EphyTreeModelNode),
-			0,
-			(GInstanceInitFunc) ephy_tree_model_node_init
-		};
-
-		static const GInterfaceInfo tree_model_info =
-		{
-			(GInterfaceInitFunc) ephy_tree_model_node_tree_model_init,
-			NULL,
-			NULL
-		};
-
-		ephy_tree_model_node_type = g_type_register_static (G_TYPE_OBJECT,
-								  "EphyTreeModelNode",
-								  &our_info, 0);
-
-		g_type_add_interface_static (ephy_tree_model_node_type,
-					     GTK_TYPE_TREE_MODEL,
-					     &tree_model_info);
-	}
-
-	return ephy_tree_model_node_type;
-}
-
-static void
-ephy_tree_model_node_class_init (EphyTreeModelNodeClass *klass)
-{
-	GObjectClass *object_class = G_OBJECT_CLASS (klass);
-
-	parent_class = g_type_class_peek_parent (klass);
-
-	object_class->finalize = ephy_tree_model_node_finalize;
-
-	object_class->set_property = ephy_tree_model_node_set_property;
-	object_class->get_property = ephy_tree_model_node_get_property;
-
-	g_object_class_install_property (object_class,
-					 PROP_ROOT,
-					 g_param_spec_object ("root",
-							      "Root node",
-							      "Root node",
-							      EPHY_TYPE_NODE,
-							      G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
-	g_object_class_install_property (object_class,
-					 PROP_FILTER,
-					 g_param_spec_object ("filter",
-							      "Filter object",
-							      "Filter object",
-							      EPHY_TYPE_NODE_FILTER,
-							      G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
-}
-
-static void
-ephy_tree_model_node_init (EphyTreeModelNode *model)
-{
-	GtkWidget *dummy;
-
-	do
-	{
-		model->stamp = g_random_int ();
-	}
-	while (model->stamp == 0);
-
-	model->priv = g_new0 (EphyTreeModelNodePrivate, 1);
-
-	dummy = gtk_tree_view_new ();
-
-	gtk_widget_destroy (dummy);
-}
-
-static void
-ephy_tree_model_node_finalize (GObject *object)
-{
-	EphyTreeModelNode *model;
-
-	g_return_if_fail (object != NULL);
-	g_return_if_fail (EPHY_IS_TREE_MODEL_NODE (object));
-
-	model = EPHY_TREE_MODEL_NODE (object);
-
-	g_return_if_fail (model->priv != NULL);
-
-	g_free (model->priv);
-
-	G_OBJECT_CLASS (parent_class)->finalize (object);
-}
-
-static void
-filter_changed_cb (EphyNodeFilter *filter,
-		   EphyTreeModelNode *model)
-{
-	GPtrArray *kids;
-	int i;
-
-	kids = ephy_node_get_children (model->priv->root);
-
-	for (i = 0; i < kids->len; i++)
-	{
-		ephy_tree_model_node_update_node (model,
-						g_ptr_array_index (kids, i),
-						i);
-	}
-
-	ephy_node_thaw (model->priv->root);
-}
-
-static void
-ephy_tree_model_node_set_property (GObject *object,
-			           guint prop_id,
-			           const GValue *value,
-			           GParamSpec *pspec)
-{
-	EphyTreeModelNode *model = EPHY_TREE_MODEL_NODE (object);
-
-	switch (prop_id)
-	{
-	case PROP_ROOT:
-		model->priv->root = g_value_get_object (value);
-
-		g_signal_connect_object (G_OBJECT (model->priv->root),
-				         "child_added",
-				         G_CALLBACK (root_child_added_cb),
-				         G_OBJECT (model),
-					 0);
-		g_signal_connect_object (G_OBJECT (model->priv->root),
-				         "child_removed",
-				         G_CALLBACK (root_child_removed_cb),
-				         G_OBJECT (model),
-					 0);
-		g_signal_connect_object (G_OBJECT (model->priv->root),
-				         "child_changed",
-				         G_CALLBACK (root_child_changed_cb),
-				         G_OBJECT (model),
-					 0);
-		g_signal_connect_object (G_OBJECT (model->priv->root),
-				         "destroyed",
-				         G_CALLBACK (root_destroyed_cb),
-				         G_OBJECT (model),
-					 0);
-
-		break;
-	case PROP_FILTER:
-		model->priv->filter = g_value_get_object (value);
-
-		if (model->priv->filter != NULL)
-		{
-			g_signal_connect_object (G_OBJECT (model->priv->filter),
-					         "changed",
-					         G_CALLBACK (filter_changed_cb),
-					         G_OBJECT (model),
-						 0);
-		}
-		break;
-	default:
-		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-		break;
-	}
-}
-
-static void
-ephy_tree_model_node_get_property (GObject *object,
-			           guint prop_id,
-				   GValue *value,
-			           GParamSpec *pspec)
-{
-	EphyTreeModelNode *model = EPHY_TREE_MODEL_NODE (object);
-
-	switch (prop_id)
-	{
-	case PROP_ROOT:
-		g_value_set_object (value, model->priv->root);
-		break;
-	case PROP_FILTER:
-		g_value_set_object (value, model->priv->filter);
-		break;
-	default:
-		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-		break;
-	}
-}
-
-EphyTreeModelNode *
-ephy_tree_model_node_new (EphyNode *root,
-			  EphyNodeFilter *filter)
-{
-	EphyTreeModelNode *model;
-
-	model = EPHY_TREE_MODEL_NODE (g_object_new (EPHY_TYPE_TREE_MODEL_NODE,
-						    "filter", filter,
-						    "root", root,
-						    NULL));
-
-	g_return_val_if_fail (model->priv != NULL, NULL);
-
-	return model;
-}
-
-static void
-ephy_tree_model_node_tree_model_init (GtkTreeModelIface *iface)
-{
-	iface->get_flags       = ephy_tree_model_node_get_flags;
-	iface->get_n_columns   = ephy_tree_model_node_get_n_columns;
-	iface->get_column_type = ephy_tree_model_node_get_column_type;
-	iface->get_iter        = ephy_tree_model_node_get_iter;
-	iface->get_path        = ephy_tree_model_node_get_path;
-	iface->get_value       = ephy_tree_model_node_get_value;
-	iface->iter_next       = ephy_tree_model_node_iter_next;
-	iface->iter_children   = ephy_tree_model_node_iter_children;
-	iface->iter_has_child  = ephy_tree_model_node_iter_has_child;
-	iface->iter_n_children = ephy_tree_model_node_iter_n_children;
-	iface->iter_nth_child  = ephy_tree_model_node_iter_nth_child;
-	iface->iter_parent     = ephy_tree_model_node_iter_parent;
-}
-
-static guint
-ephy_tree_model_node_get_flags (GtkTreeModel *tree_model)
-{
-	return 0;
-}
-
-static int
-ephy_tree_model_node_get_n_columns (GtkTreeModel *tree_model)
-{
-	return EPHY_TREE_MODEL_NODE_NUM_COLUMNS;
-}
-
-static GType
-ephy_tree_model_node_get_column_type (GtkTreeModel *tree_model,
-			              int index)
-{
-	g_return_val_if_fail (EPHY_IS_TREE_MODEL_NODE (tree_model), G_TYPE_INVALID);
-	g_return_val_if_fail ((index < EPHY_TREE_MODEL_NODE_NUM_COLUMNS) && (index >= 0), G_TYPE_INVALID);
-
-	switch (index)
-	{
-		case EPHY_TREE_MODEL_NODE_COL_BOOKMARK:
-		case EPHY_TREE_MODEL_NODE_COL_KEYWORD:
-			return G_TYPE_STRING;
-		case EPHY_TREE_MODEL_NODE_COL_TITLE_WEIGHT:
-		case EPHY_TREE_MODEL_NODE_COL_PRIORITY:	
-			return G_TYPE_INT;
-		case EPHY_TREE_MODEL_NODE_COL_VISIBLE:
-			return G_TYPE_BOOLEAN;
-		case EPHY_TREE_MODEL_NODE_COL_ICON:
-			return GDK_TYPE_PIXBUF;
-	default:
-		g_assert_not_reached ();
-		return G_TYPE_INVALID;
-	}
-}
-
-static gboolean
-ephy_tree_model_node_get_iter (GtkTreeModel *tree_model,
-			       GtkTreeIter *iter,
-			       GtkTreePath *path)
-{
-	EphyTreeModelNode *model = EPHY_TREE_MODEL_NODE (tree_model);
-	int i;
-
-	g_return_val_if_fail (EPHY_IS_TREE_MODEL_NODE (model), FALSE);
-	g_return_val_if_fail (gtk_tree_path_get_depth (path) > 0, FALSE);
-
-	if (model->priv->root == NULL)
-		return FALSE;
-
-	i = gtk_tree_path_get_indices (path)[0];
-
-	iter->stamp = model->stamp;
-	iter->user_data = ephy_node_get_nth_child (model->priv->root, i);
-
-	if (iter->user_data == NULL)
-	{
-		iter->stamp = 0;
-		return FALSE;
-	}
-
-	return TRUE;
-}
-
-static inline GtkTreePath *
-get_path_real (EphyTreeModelNode *model,
-	       EphyNode *node)
-{
-	GtkTreePath *retval;
-
-	retval = gtk_tree_path_new ();
-	gtk_tree_path_append_index (retval, ephy_node_get_child_index (model->priv->root, node));
-
-	return retval;
-}
-
-static GtkTreePath *
-ephy_tree_model_node_get_path (GtkTreeModel *tree_model,
-			       GtkTreeIter *iter)
-{
-	EphyTreeModelNode *model = EPHY_TREE_MODEL_NODE (tree_model);
-	EphyNode *node;
-
-	g_return_val_if_fail (EPHY_IS_TREE_MODEL_NODE (tree_model), NULL);
-	g_return_val_if_fail (iter != NULL, NULL);
-	g_return_val_if_fail (iter->user_data != NULL, NULL);
-	g_return_val_if_fail (iter->stamp == model->stamp, NULL);
-
-	if (model->priv->root == NULL)
-		return NULL;
-
-	node = EPHY_NODE (iter->user_data);
-
-	if (node == model->priv->root)
-		return gtk_tree_path_new ();
-
-	return get_path_real (model, node);
-}
-
-static void
-get_icon_pixbuf (EphyNode *node, GValue *value)
-{
-	EphyFaviconCache *cache;
-	const char *icon_location;
-	GdkPixbuf *pixbuf = NULL;
-
-	cache = ephy_embed_shell_get_favicon_cache (EPHY_EMBED_SHELL (ephy_shell));
-	icon_location = ephy_node_get_property_string
-		(node, EPHY_NODE_BMK_PROP_ICON);
-
-	LOG ("Get favicon for %s", icon_location ? icon_location : "None")
-
-	if (icon_location)
-	{
-		pixbuf = ephy_favicon_cache_get (cache, icon_location);
-	}
-
-	g_value_init (value, GDK_TYPE_PIXBUF);
-	g_value_set_object (value, pixbuf);
-}
-
-static void
-ephy_tree_model_node_get_value (GtkTreeModel *tree_model,
-			        GtkTreeIter *iter,
-			        int column,
-			        GValue *value)
-{
-	EphyTreeModelNode *model = EPHY_TREE_MODEL_NODE (tree_model);
-	EphyNode *node;
-	int priority;
-
-	g_return_if_fail (EPHY_IS_TREE_MODEL_NODE (tree_model));
-	g_return_if_fail (iter != NULL);
-	g_return_if_fail (iter->stamp == model->stamp);
-	g_return_if_fail (EPHY_IS_NODE (iter->user_data));
-	g_return_if_fail (column < EPHY_TREE_MODEL_NODE_NUM_COLUMNS);
-
-	if (model->priv->root == NULL)
-		return;
-
-	node = EPHY_NODE (iter->user_data);
-
-	switch (column)
-	{
-	case EPHY_TREE_MODEL_NODE_COL_BOOKMARK:
-		ephy_node_get_property (node,
-				        EPHY_NODE_BMK_PROP_TITLE,
-				        value);
-		break;
-	case EPHY_TREE_MODEL_NODE_COL_KEYWORD:
-		ephy_node_get_property (node,
-				        EPHY_NODE_KEYWORD_PROP_NAME,
-				        value);
-		break;
-	case EPHY_TREE_MODEL_NODE_COL_ICON:
-		get_icon_pixbuf (node, value);
-	break;
-
-	case EPHY_TREE_MODEL_NODE_COL_VISIBLE:
-		g_value_init (value, G_TYPE_BOOLEAN);
-
-		if (model->priv->filter != NULL)
-		{
-			g_value_set_boolean (value,
-					     ephy_node_filter_evaluate (model->priv->filter, node));
-		}
-		else
-		{
-			g_value_set_boolean (value, TRUE);
-		}
-		break;
-	case EPHY_TREE_MODEL_NODE_COL_TITLE_WEIGHT:
-		g_value_init (value, G_TYPE_INT);
-		priority = ephy_node_get_property_int (node, EPHY_NODE_KEYWORD_PROP_PRIORITY);
-		if (priority == EPHY_BOOKMARKS_KEYWORD_ALL_PRIORITY ||
-		    priority == EPHY_BOOKMARKS_KEYWORD_SPECIAL_PRIORITY)
-			g_value_set_int (value, PANGO_WEIGHT_BOLD);
-		else
-			g_value_set_int (value, PANGO_WEIGHT_NORMAL);
-		break;
-	case EPHY_TREE_MODEL_NODE_COL_PRIORITY:
-		g_value_init (value, G_TYPE_INT);
-		priority = ephy_node_get_property_int (node, EPHY_NODE_KEYWORD_PROP_PRIORITY);
-		if (priority == EPHY_BOOKMARKS_KEYWORD_ALL_PRIORITY ||
-		    priority == EPHY_BOOKMARKS_KEYWORD_SPECIAL_PRIORITY)
-			g_value_set_int (value, priority);
-		else
-			g_value_set_int (value, EPHY_BOOKMARKS_KEYWORD_NORMAL_PRIORITY);
-		break;
-	default:
-		g_assert_not_reached ();
-		break;
-	}
-}
-
-static gboolean
-ephy_tree_model_node_iter_next (GtkTreeModel *tree_model,
-			        GtkTreeIter *iter)
-{
-	EphyTreeModelNode *model = EPHY_TREE_MODEL_NODE (tree_model);
-	EphyNode *node;
-
-	g_return_val_if_fail (iter != NULL, FALSE);
-	g_return_val_if_fail (iter->user_data != NULL, FALSE);
-	g_return_val_if_fail (iter->stamp == EPHY_TREE_MODEL_NODE (tree_model)->stamp, FALSE);
-
-	if (model->priv->root == NULL)
-		return FALSE;
-
-	node = EPHY_NODE (iter->user_data);
-
-	if (node == model->priv->root)
-		return FALSE;
-
-	iter->user_data = ephy_node_get_next_child (model->priv->root, node);
-
-	return (iter->user_data != NULL);
-}
-
-static gboolean
-ephy_tree_model_node_iter_children (GtkTreeModel *tree_model,
-			            GtkTreeIter *iter,
-			            GtkTreeIter *parent)
-{
-	EphyTreeModelNode *model = EPHY_TREE_MODEL_NODE (tree_model);
-
-	if (model->priv->root == NULL)
-		return FALSE;
-
-	if (parent != NULL)
-		return FALSE;
-
-	iter->stamp = model->stamp;
-	iter->user_data = model->priv->root;
-
-	return TRUE;
-}
-
-static gboolean
-ephy_tree_model_node_iter_has_child (GtkTreeModel *tree_model,
-			             GtkTreeIter *iter)
-{
-	return FALSE;
-}
-
-static int
-ephy_tree_model_node_iter_n_children (GtkTreeModel *tree_model,
-			              GtkTreeIter *iter)
-{
-	EphyTreeModelNode *model = EPHY_TREE_MODEL_NODE (tree_model);
-
-	g_return_val_if_fail (EPHY_IS_TREE_MODEL_NODE (tree_model), -1);
-
-	if (model->priv->root == NULL)
-		return 0;
-
-	if (iter == NULL)
-		return ephy_node_get_n_children (model->priv->root);
-
-	g_return_val_if_fail (model->stamp == iter->stamp, -1);
-
-	return 0;
-}
-
-static gboolean
-ephy_tree_model_node_iter_nth_child (GtkTreeModel *tree_model,
-			             GtkTreeIter *iter,
-			             GtkTreeIter *parent,
-			             int n)
-{
-	EphyTreeModelNode *model = EPHY_TREE_MODEL_NODE (tree_model);
-	EphyNode *node;
-
-	g_return_val_if_fail (EPHY_IS_TREE_MODEL_NODE (tree_model), FALSE);
-
-	if (model->priv->root == NULL)
-		return FALSE;
-
-	if (parent != NULL)
-		return FALSE;
-
-	node = ephy_node_get_nth_child (model->priv->root, n);
-
-	if (node != NULL)
-	{
-		iter->stamp = model->stamp;
-		iter->user_data = node;
-		return TRUE;
-	}
-	else
-		return FALSE;
-}
-
-static gboolean
-ephy_tree_model_node_iter_parent (GtkTreeModel *tree_model,
-			          GtkTreeIter *iter,
-			          GtkTreeIter *child)
-{
-	return FALSE;
-}
-
-EphyNode *
-ephy_tree_model_node_node_from_iter (EphyTreeModelNode *model,
-				     GtkTreeIter *iter)
-{
-	return EPHY_NODE (iter->user_data);
-}
-
-void
-ephy_tree_model_node_iter_from_node (EphyTreeModelNode *model,
-				     EphyNode *node,
-				     GtkTreeIter *iter)
-{
-	iter->stamp = model->stamp;
-	iter->user_data = node;
-}
-
-static void
-root_child_removed_cb (EphyNode *node,
-		       EphyNode *child,
-		       EphyTreeModelNode *model)
-{
-	GtkTreePath *path;
-
-	path = get_path_real (model, child);
-	gtk_tree_model_row_deleted (GTK_TREE_MODEL (model), path);
-	gtk_tree_path_free (path);
-}
-
-static void
-root_child_added_cb (EphyNode *node,
-		     EphyNode *child,
-		     EphyTreeModelNode *model)
-{
-	GtkTreePath *path;
-	GtkTreeIter iter;
-
-	ephy_tree_model_node_iter_from_node (model, child, &iter);
-
-	path = get_path_real (model, child);
-	gtk_tree_model_row_inserted (GTK_TREE_MODEL (model), path, &iter);
-	gtk_tree_path_free (path);
-}
-
-static inline void
-ephy_tree_model_node_update_node (EphyTreeModelNode *model,
-				  EphyNode *node,
-				  int idx)
-{
-	GtkTreePath *path;
-	GtkTreeIter iter;
-
-	ephy_tree_model_node_iter_from_node (model, node, &iter);
-
-	if (idx >= 0)
-	{
-		path = gtk_tree_path_new ();
-		gtk_tree_path_append_index (path, idx);
-	}
-	else
-	{
-		path = get_path_real (model, node);
-	}
-
-	LOG ("Updating row")
-
-	gtk_tree_model_row_changed (GTK_TREE_MODEL (model), path, &iter);
-	gtk_tree_path_free (path);
-}
-
-static void
-root_child_changed_cb (EphyNode *node,
-		       EphyNode *child,
-		       EphyTreeModelNode *model)
-{
-	ephy_tree_model_node_update_node (model, child, -1);
-}
-
-static void
-root_destroyed_cb (EphyNode *node,
-		   EphyTreeModelNode *model)
-{
-	model->priv->root = NULL;
-
-	/* no need to do other stuff since we should have had a bunch of child_removed
-	 * signals already */
-}
-
-GType
-ephy_tree_model_node_column_get_type (void)
-{
-	static GType etype = 0;
-
-	if (etype == 0)
-	{
-		static const GEnumValue values[] =
-		{
-			{ EPHY_TREE_MODEL_NODE_COL_BOOKMARK, "EPHY_TREE_MODEL_NODE_COL_BOOKMARK", "bookmark" },
-			{ EPHY_TREE_MODEL_NODE_COL_KEYWORD,  "EPHY_TREE_MODEL_NODE_COL_KEYWORD", "keyword" },
-			{ EPHY_TREE_MODEL_NODE_COL_ICON,     "EPHY_TREE_MODEL_NODE_COL_ICON", "icon" },
-			{ EPHY_TREE_MODEL_NODE_COL_VISIBLE,  "EPHY_TREE_MODEL_NODE_COL_VISIBLE", "visible" },
-			{ EPHY_TREE_MODEL_NODE_COL_TITLE_WEIGHT, "EPHY_TREE_MODEL_NODE_COL_TITLE_WEIGHT", "title weight" },
-			{ EPHY_TREE_MODEL_NODE_COL_PRIORITY, "EPHY_TREE_MODEL_NODE_COL_PRIORITY", "priority" },
-
-			{ 0, 0, 0 }
-		};
-
-		etype = g_enum_register_static ("EphyTreeModelNodeColumn", values);
-	}
-
-	return etype;
-}
-