]> Pileus Git - ~andy/gtk/blobdiff - gtk/gtktreestore.c
change scroll_to_cell delayed code to happen in size_allocate.
[~andy/gtk] / gtk / gtktreestore.c
index 24829803a3a286063596c5f308a1ca9a2ad827d6..764b9d1e87659d9635b12229cfcbd6832125828d 100644 (file)
@@ -1,5 +1,5 @@
 /* gtktreestore.c
- * Copyright (C) 2000  Red Hat, Inc.,  Jonathan Blandford <jrb@redhat.com>
 * Copyright (C) 2000  Red Hat, Inc.,  Jonathan Blandford <jrb@redhat.com>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
 #include "gtktreemodel.h"
 #include "gtktreestore.h"
 #include "gtktreedatalist.h"
-#include "gtksignal.h"
+#include "gtktreednd.h"
 #include <string.h>
+#include <gobject/gvaluecollector.h>
 
 #define G_NODE(node) ((GNode *)node)
+#define GTK_TREE_STORE_IS_SORTED(tree) (GTK_TREE_STORE (tree)->sort_column_id != -2)
+#define VALID_ITER(iter, tree_store) (iter!= NULL && iter->user_data != NULL && tree_store->stamp == iter->stamp)
+
+static void         gtk_tree_store_init            (GtkTreeStore      *tree_store);
+static void         gtk_tree_store_class_init      (GtkTreeStoreClass *tree_store_class);
+static void         gtk_tree_store_tree_model_init (GtkTreeModelIface *iface);
+static void         gtk_tree_store_drag_source_init(GtkTreeDragSourceIface *iface);
+static void         gtk_tree_store_drag_dest_init  (GtkTreeDragDestIface   *iface);
+static void         gtk_tree_store_sortable_init   (GtkTreeSortableIface   *iface);
+static guint        gtk_tree_store_get_flags       (GtkTreeModel      *tree_model);
+static gint         gtk_tree_store_get_n_columns   (GtkTreeModel      *tree_model);
+static GType        gtk_tree_store_get_column_type (GtkTreeModel      *tree_model,
+                                                   gint               index);
+static gboolean     gtk_tree_store_get_iter        (GtkTreeModel      *tree_model,
+                                                   GtkTreeIter       *iter,
+                                                   GtkTreePath       *path);
+static GtkTreePath *gtk_tree_store_get_path        (GtkTreeModel      *tree_model,
+                                                   GtkTreeIter       *iter);
+static void         gtk_tree_store_get_value       (GtkTreeModel      *tree_model,
+                                                   GtkTreeIter       *iter,
+                                                   gint               column,
+                                                   GValue            *value);
+static gboolean     gtk_tree_store_iter_next       (GtkTreeModel      *tree_model,
+                                                   GtkTreeIter       *iter);
+static gboolean     gtk_tree_store_iter_children   (GtkTreeModel      *tree_model,
+                                                   GtkTreeIter       *iter,
+                                                   GtkTreeIter       *parent);
+static gboolean     gtk_tree_store_iter_has_child  (GtkTreeModel      *tree_model,
+                                                   GtkTreeIter       *iter);
+static gint         gtk_tree_store_iter_n_children (GtkTreeModel      *tree_model,
+                                                   GtkTreeIter       *iter);
+static gboolean     gtk_tree_store_iter_nth_child  (GtkTreeModel      *tree_model,
+                                                   GtkTreeIter       *iter,
+                                                   GtkTreeIter       *parent,
+                                                   gint               n);
+static gboolean     gtk_tree_store_iter_parent     (GtkTreeModel      *tree_model,
+                                                   GtkTreeIter       *iter,
+                                                   GtkTreeIter       *child);
+
+
+static void gtk_tree_store_set_n_columns   (GtkTreeStore *tree_store,
+                                           gint          n_columns);
+static void gtk_tree_store_set_column_type (GtkTreeStore *tree_store,
+                                           gint          column,
+                                           GType         type);
+
+
+/* DND interfaces */
+static gboolean gtk_tree_store_drag_data_delete   (GtkTreeDragSource *drag_source,
+                                                  GtkTreePath       *path);
+static gboolean gtk_tree_store_drag_data_get      (GtkTreeDragSource *drag_source,
+                                                  GtkTreePath       *path,
+                                                  GtkSelectionData  *selection_data);
+static gboolean gtk_tree_store_drag_data_received (GtkTreeDragDest   *drag_dest,
+                                                  GtkTreePath       *dest,
+                                                  GtkSelectionData  *selection_data);
+static gboolean gtk_tree_store_row_drop_possible  (GtkTreeDragDest   *drag_dest,
+                                                  GtkTreeModel      *src_model,
+                                                  GtkTreePath       *src_path,
+                                                  GtkTreePath       *dest_path);
+
+/* Sortable Interfaces */
+
+static void     gtk_tree_store_sort                    (GtkTreeStore           *tree_store);
+static void     gtk_tree_store_sort_iter_changed       (GtkTreeStore           *tree_store,
+                                                       GtkTreeIter            *iter,
+                                                       gint                    column);
+static gboolean gtk_tree_store_get_sort_column_id      (GtkTreeSortable        *sortable,
+                                                       gint                   *sort_column_id,
+                                                       GtkSortType            *order);
+static void     gtk_tree_store_set_sort_column_id      (GtkTreeSortable        *sortable,
+                                                       gint                    sort_column_id,
+                                                       GtkSortType             order);
+static void     gtk_tree_store_set_sort_func           (GtkTreeSortable        *sortable,
+                                                       gint                    sort_column_id,
+                                                       GtkTreeIterCompareFunc  func,
+                                                       gpointer                data,
+                                                       GtkDestroyNotify        destroy);
+static void     gtk_tree_store_set_default_sort_func   (GtkTreeSortable        *sortable,
+                                                       GtkTreeIterCompareFunc  func,
+                                                       gpointer                data,
+                                                       GtkDestroyNotify        destroy);
+static gboolean gtk_tree_store_has_default_sort_func   (GtkTreeSortable        *sortable);
+
+static void     validate_gnode                    (GNode *node);
+
+static inline void
+validate_tree (GtkTreeStore *tree_store)
+{
+  if (gtk_debug_flags & GTK_DEBUG_TREE)
+    {
+      g_assert (G_NODE (tree_store->root)->parent == NULL);
 
-enum {
-  NODE_CHANGED,
-  NODE_INSERTED,
-  NODE_CHILD_TOGGLED,
-  NODE_DELETED,
-  LAST_SIGNAL
-};
-
-static guint tree_store_signals[LAST_SIGNAL] = { 0 };
-
-static void           gtk_tree_store_init            (GtkTreeStore      *tree_store);
-static void           gtk_tree_store_class_init      (GtkTreeStoreClass *tree_store_class);
-static void           gtk_tree_store_tree_model_init (GtkTreeModelIface *iface);
-static gint           gtk_tree_store_get_n_columns   (GtkTreeModel      *tree_model);
-static GtkTreeNode    gtk_tree_store_get_node        (GtkTreeModel      *tree_model,
-                                                     GtkTreePath       *path);
-static GtkTreePath   *gtk_tree_store_get_path        (GtkTreeModel      *tree_model,
-                                                     GtkTreeNode        node);
-static void           gtk_tree_store_node_get_value  (GtkTreeModel      *tree_model,
-                                                     GtkTreeNode        node,
-                                                     gint               column,
-                                                     GValue            *value);
-static gboolean       gtk_tree_store_node_next       (GtkTreeModel      *tree_model,
-                                                     GtkTreeNode       *node);
-static GtkTreeNode    gtk_tree_store_node_children   (GtkTreeModel      *tree_model,
-                                                     GtkTreeNode        node);
-static gboolean       gtk_tree_store_node_has_child  (GtkTreeModel      *tree_model,
-                                                     GtkTreeNode        node);
-static gint           gtk_tree_store_node_n_children (GtkTreeModel      *tree_model,
-                                                     GtkTreeNode        node);
-static GtkTreeNode    gtk_tree_store_node_nth_child  (GtkTreeModel      *tree_model,
-                                                     GtkTreeNode        node,
-                                                     gint               n);
-static GtkTreeNode    gtk_tree_store_node_parent     (GtkTreeModel      *tree_model,
-                                                     GtkTreeNode        node);
-
-
+      validate_gnode (G_NODE (tree_store->root));
+    }
+}
 
 GtkType
 gtk_tree_store_get_type (void)
 {
-  static GtkType tree_store_type = 0;
+  static GType tree_store_type = 0;
 
   if (!tree_store_type)
     {
@@ -90,10 +149,42 @@ gtk_tree_store_get_type (void)
        NULL
       };
 
-      tree_store_type = g_type_register_static (GTK_TYPE_OBJECT, "GtkTreeStore", &tree_store_info);
+      static const GInterfaceInfo drag_source_info =
+      {
+       (GInterfaceInitFunc) gtk_tree_store_drag_source_init,
+       NULL,
+       NULL
+      };
+
+      static const GInterfaceInfo drag_dest_info =
+      {
+       (GInterfaceInitFunc) gtk_tree_store_drag_dest_init,
+       NULL,
+       NULL
+      };
+
+      static const GInterfaceInfo sortable_info =
+      {
+       (GInterfaceInitFunc) gtk_tree_store_sortable_init,
+       NULL,
+       NULL
+      };
+
+      tree_store_type = g_type_register_static (G_TYPE_OBJECT, "GtkTreeStore", &tree_store_info, 0);
+
       g_type_add_interface_static (tree_store_type,
                                   GTK_TYPE_TREE_MODEL,
                                   &tree_model_info);
+      g_type_add_interface_static (tree_store_type,
+                                  GTK_TYPE_TREE_DRAG_SOURCE,
+                                  &drag_source_info);
+      g_type_add_interface_static (tree_store_type,
+                                  GTK_TYPE_TREE_DRAG_DEST,
+                                  &drag_dest_info);
+      g_type_add_interface_static (tree_store_type,
+                                  GTK_TYPE_TREE_SORTABLE,
+                                  &sortable_info);
+
     }
 
   return tree_store_type;
@@ -102,107 +193,157 @@ gtk_tree_store_get_type (void)
 static void
 gtk_tree_store_class_init (GtkTreeStoreClass *tree_store_class)
 {
-  GtkObjectClass *object_class;
-
-  object_class = (GtkObjectClass *) tree_store_class;
-
-  tree_store_signals[NODE_CHANGED] =
-    gtk_signal_new ("node_changed",
-                    GTK_RUN_FIRST,
-                    GTK_CLASS_TYPE (object_class),
-                    GTK_SIGNAL_OFFSET (GtkTreeStoreClass, node_changed),
-                    gtk_marshal_NONE__POINTER_POINTER,
-                    GTK_TYPE_NONE, 2,
-                   GTK_TYPE_POINTER,
-                   GTK_TYPE_POINTER);
-  tree_store_signals[NODE_INSERTED] =
-    gtk_signal_new ("node_inserted",
-                    GTK_RUN_FIRST,
-                    GTK_CLASS_TYPE (object_class),
-                    GTK_SIGNAL_OFFSET (GtkTreeStoreClass, node_inserted),
-                    gtk_marshal_NONE__POINTER_POINTER,
-                    GTK_TYPE_NONE, 2,
-                   GTK_TYPE_POINTER,
-                   GTK_TYPE_POINTER);
-  tree_store_signals[NODE_CHILD_TOGGLED] =
-    gtk_signal_new ("node_child_toggled",
-                    GTK_RUN_FIRST,
-                    GTK_CLASS_TYPE (object_class),
-                    GTK_SIGNAL_OFFSET (GtkTreeStoreClass, node_child_toggled),
-                    gtk_marshal_NONE__POINTER_POINTER,
-                    GTK_TYPE_NONE, 2,
-                   GTK_TYPE_POINTER,
-                   GTK_TYPE_POINTER);
-  tree_store_signals[NODE_DELETED] =
-    gtk_signal_new ("node_deleted",
-                    GTK_RUN_FIRST,
-                    GTK_CLASS_TYPE (object_class),
-                    GTK_SIGNAL_OFFSET (GtkTreeStoreClass, node_deleted),
-                    gtk_marshal_NONE__POINTER,
-                    GTK_TYPE_NONE, 1,
-                   GTK_TYPE_POINTER);
-
-  gtk_object_class_add_signals (object_class, tree_store_signals, LAST_SIGNAL);
+  GObjectClass *object_class;
+
+  object_class = (GObjectClass *) tree_store_class;
+
 }
 
 static void
 gtk_tree_store_tree_model_init (GtkTreeModelIface *iface)
 {
+  iface->get_flags = gtk_tree_store_get_flags;
   iface->get_n_columns = gtk_tree_store_get_n_columns;
-  iface->get_node = gtk_tree_store_get_node;
+  iface->get_column_type = gtk_tree_store_get_column_type;
+  iface->get_iter = gtk_tree_store_get_iter;
   iface->get_path = gtk_tree_store_get_path;
-  iface->node_get_value = gtk_tree_store_node_get_value;
-  iface->node_next = gtk_tree_store_node_next;
-  iface->node_children = gtk_tree_store_node_children;
-  iface->node_has_child = gtk_tree_store_node_has_child;
-  iface->node_n_children = gtk_tree_store_node_n_children;
-  iface->node_nth_child = gtk_tree_store_node_nth_child;
-  iface->node_parent = gtk_tree_store_node_parent;
+  iface->get_value = gtk_tree_store_get_value;
+  iface->iter_next = gtk_tree_store_iter_next;
+  iface->iter_children = gtk_tree_store_iter_children;
+  iface->iter_has_child = gtk_tree_store_iter_has_child;
+  iface->iter_n_children = gtk_tree_store_iter_n_children;
+  iface->iter_nth_child = gtk_tree_store_iter_nth_child;
+  iface->iter_parent = gtk_tree_store_iter_parent;
 }
 
 static void
-gtk_tree_store_init (GtkTreeStore *tree_store)
+gtk_tree_store_drag_source_init (GtkTreeDragSourceIface *iface)
+{
+  iface->drag_data_delete = gtk_tree_store_drag_data_delete;
+  iface->drag_data_get = gtk_tree_store_drag_data_get;
+}
+
+static void
+gtk_tree_store_drag_dest_init (GtkTreeDragDestIface *iface)
+{
+  iface->drag_data_received = gtk_tree_store_drag_data_received;
+  iface->row_drop_possible = gtk_tree_store_row_drop_possible;
+}
+
+static void
+gtk_tree_store_sortable_init (GtkTreeSortableIface *iface)
 {
-  tree_store->root = gtk_tree_store_node_new ();
+  iface->get_sort_column_id = gtk_tree_store_get_sort_column_id;
+  iface->set_sort_column_id = gtk_tree_store_set_sort_column_id;
+  iface->set_sort_func = gtk_tree_store_set_sort_func;
+  iface->set_default_sort_func = gtk_tree_store_set_default_sort_func;
+  iface->has_default_sort_func = gtk_tree_store_has_default_sort_func;
 }
 
-GtkObject *
-gtk_tree_store_new (void)
+static void
+gtk_tree_store_init (GtkTreeStore *tree_store)
 {
-  return GTK_OBJECT (gtk_type_new (gtk_tree_store_get_type ()));
+  tree_store->root = g_node_new (NULL);
+  do
+    {
+      tree_store->stamp = g_random_int ();
+    }
+  while (tree_store->stamp == 0);
+  tree_store->sort_list = NULL;
+  tree_store->sort_column_id = -2;
 }
 
-GtkObject *
-gtk_tree_store_new_with_values (gint n_columns,
-                               ...)
+/**
+ * gtk_tree_store_new:
+ * @n_columns: number of columns in the tree store
+ * @Varargs: all #GType types for the columns, from first to last
+ *
+ * Creates a new tree store as with @n_columns columns each of the types passed
+ * in.  As an example, gtk_tree_store_new (3, G_TYPE_INT, G_TYPE_STRING,
+ * GDK_TYPE_PIXBUF); will create a new GtkTreeStore with three columns, of type
+ * int, string and GDkPixbuf respectively.
+ *
+ * Return value: a new #GtkTreeStore
+ **/
+GtkTreeStore *
+gtk_tree_store_new (gint n_columns,
+                              ...)
 {
-  GtkObject *retval;
+  GtkTreeStore *retval;
   va_list args;
   gint i;
 
   g_return_val_if_fail (n_columns > 0, NULL);
 
-  retval = gtk_tree_store_new ();
-  gtk_tree_store_set_n_columns (GTK_TREE_STORE (retval),
-                               n_columns);
+  retval = GTK_TREE_STORE (g_object_new (GTK_TYPE_TREE_STORE, NULL));
+  gtk_tree_store_set_n_columns (retval, n_columns);
 
   va_start (args, n_columns);
-  for (i = 0; i < n_columns; i++)
-    gtk_tree_store_set_column_type (GTK_TREE_STORE (retval),
-                                   i, va_arg (args, GType));
 
+  for (i = 0; i < n_columns; i++)
+    {
+      GType type = va_arg (args, GType);
+      if (! _gtk_tree_data_list_check_type (type))
+       {
+         g_warning ("%s: Invalid type %s passed to gtk_tree_store_new_with_types\n", G_STRLOC, g_type_name (type));
+         g_object_unref (G_OBJECT (retval));
+         return NULL;
+       }
+      gtk_tree_store_set_column_type (retval, i, type);
+    }
   va_end (args);
 
   return retval;
 }
+/**
+ * gtk_tree_store_newv:
+ * @n_columns: number of columns in the tree store
+ * @types: an array of #GType types for the columns, from first to last
+ *
+ * Non vararg creation function.  Used primarily by language bindings.
+ *
+ * Return value: a new #GtkTreeStore
+ **/
+GtkTreeStore *
+gtk_tree_store_newv (gint   n_columns,
+                    GType *types)
+{
+  GtkTreeStore *retval;
+  gint i;
 
-void
+  g_return_val_if_fail (n_columns > 0, NULL);
+
+  retval = GTK_TREE_STORE (g_object_new (GTK_TYPE_TREE_STORE, NULL));
+  gtk_tree_store_set_n_columns (retval, n_columns);
+
+   for (i = 0; i < n_columns; i++)
+    {
+      if (! _gtk_tree_data_list_check_type (types[i]))
+       {
+         g_warning ("%s: Invalid type %s passed to gtk_tree_store_new_with_types\n", G_STRLOC, g_type_name (types[i]));
+         g_object_unref (G_OBJECT (retval));
+         return NULL;
+       }
+      gtk_tree_store_set_column_type (retval, i, types[i]);
+    }
+
+  return retval;
+}
+
+/**
+ * gtk_tree_store_set_n_columns:
+ * @tree_store:
+ * @n_columns:
+ *
+ * As a side effect of calling this function, all sort columns that overlap with
+ * the current number of columns will be removed.
+ **/
+static void
 gtk_tree_store_set_n_columns (GtkTreeStore *tree_store,
                              gint          n_columns)
 {
   GType *new_columns;
 
-  g_return_if_fail (tree_store != NULL);
   g_return_if_fail (GTK_IS_TREE_STORE (tree_store));
 
   if (tree_store->n_columns == n_columns)
@@ -220,86 +361,148 @@ gtk_tree_store_set_n_columns (GtkTreeStore *tree_store,
       g_free (tree_store->column_headers);
     }
 
+  if (tree_store->sort_list)
+    _gtk_tree_data_list_header_free (tree_store->sort_list);
+
+  tree_store->sort_list = _gtk_tree_data_list_header_new (n_columns, tree_store->column_headers);
+
   tree_store->column_headers = new_columns;
   tree_store->n_columns = n_columns;
 }
 
-void
+/**
+ * gtk_tree_store_set_column_type:
+ * @tree_store: a #GtkTreeStore
+ * @column: column number
+ * @type: type of the data to be stored in @column
+ *
+ * Supported types include: %G_TYPE_UINT, %G_TYPE_INT, %G_TYPE_UCHAR,
+ * %G_TYPE_CHAR, %G_TYPE_BOOLEAN, %G_TYPE_POINTER, %G_TYPE_FLOAT,
+ * %G_TYPE_DOUBLE, %G_TYPE_STRING, %G_TYPE_OBJECT, and %G_TYPE_BOXED, along with
+ * subclasses of those types such as %GDK_TYPE_PIXBUF.
+ *
+ **/
+static void
 gtk_tree_store_set_column_type (GtkTreeStore *tree_store,
                                gint          column,
                                GType         type)
 {
-  g_return_if_fail (tree_store != NULL);
   g_return_if_fail (GTK_IS_TREE_STORE (tree_store));
   g_return_if_fail (column >=0 && column < tree_store->n_columns);
-
+  if (!_gtk_tree_data_list_check_type (type))
+    {
+      g_warning ("%s: Invalid type %s passed to gtk_tree_store_new_with_types\n", G_STRLOC, g_type_name (type));
+      return;
+    }
   tree_store->column_headers[column] = type;
 }
 
 /* fulfill the GtkTreeModel requirements */
 /* NOTE: GtkTreeStore::root is a GNode, that acts as the parent node.  However,
- * it is not visible to the tree or to the user., and the path "1" refers to the
+ * it is not visible to the tree or to the user., and the path "0" refers to the
  * first child of GtkTreeStore::root.
  */
+
+
+static guint
+gtk_tree_store_get_flags (GtkTreeModel *tree_model)
+{
+  g_return_val_if_fail (GTK_IS_TREE_STORE (tree_model), 0);
+
+  return GTK_TREE_MODEL_ITERS_PERSIST;
+}
+
 static gint
 gtk_tree_store_get_n_columns (GtkTreeModel *tree_model)
 {
-  g_return_val_if_fail (tree_model != NULL, 0);
   g_return_val_if_fail (GTK_IS_TREE_STORE (tree_model), 0);
 
   return GTK_TREE_STORE (tree_model)->n_columns;
 }
 
-static GtkTreeNode
-gtk_tree_store_get_node (GtkTreeModel *tree_model,
+static GType
+gtk_tree_store_get_column_type (GtkTreeModel *tree_model,
+                               gint          index)
+{
+  g_return_val_if_fail (GTK_IS_TREE_STORE (tree_model), G_TYPE_INVALID);
+  g_return_val_if_fail (index < GTK_TREE_STORE (tree_model)->n_columns &&
+                       index >= 0, G_TYPE_INVALID);
+
+  return GTK_TREE_STORE (tree_model)->column_headers[index];
+}
+
+static gboolean
+gtk_tree_store_get_iter (GtkTreeModel *tree_model,
+                        GtkTreeIter  *iter,
                         GtkTreePath  *path)
 {
-  gint i;
-  GtkTreeNode node;
-  gint *indices = gtk_tree_path_get_indices (path);
+  GtkTreeStore *tree_store = (GtkTreeStore *) tree_model;
+  GtkTreeIter parent;
+  gint *indices;
+  gint depth, i;
+
+  g_return_val_if_fail (GTK_IS_TREE_STORE (tree_store), FALSE);
+  
+  indices = gtk_tree_path_get_indices (path);
+  depth = gtk_tree_path_get_depth (path);
+
+  g_return_val_if_fail (depth > 0, FALSE);
+
+  parent.stamp = tree_store->stamp;
+  parent.user_data = tree_store->root;
 
-  node = GTK_TREE_STORE (tree_model)->root;
+  if (! gtk_tree_model_iter_nth_child (tree_model, iter, &parent, indices[0]))
+    return FALSE;
 
-  for (i = 0; i < gtk_tree_path_get_depth (path); i ++)
+  for (i = 1; i < depth; i++)
     {
-      node = (GtkTreeNode) gtk_tree_store_node_nth_child (tree_model,
-                                                         (GtkTreeNode) node,
-                                                         indices[i]);
-      if (node == NULL)
-       return NULL;
-    };
-  return (GtkTreeNode) node;
+      parent = *iter;
+      if (! gtk_tree_model_iter_nth_child (tree_model, iter, &parent, indices[i]))
+       return FALSE;
+    }
+
+  return TRUE;
 }
 
 static GtkTreePath *
 gtk_tree_store_get_path (GtkTreeModel *tree_model,
-                        GtkTreeNode   node)
+                        GtkTreeIter  *iter)
 {
   GtkTreePath *retval;
   GNode *tmp_node;
   gint i = 0;
 
-  g_return_val_if_fail (tree_model != NULL, NULL);
+  g_return_val_if_fail (GTK_IS_TREE_STORE (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 == GTK_TREE_STORE (tree_model)->stamp, NULL);
 
-  if (node == NULL)
-    return NULL;
-  if (node == G_NODE (GTK_TREE_STORE (tree_model)->root))
-    return NULL;
+  validate_tree ((GtkTreeStore*)tree_model);
+
+  if (G_NODE (iter->user_data)->parent == NULL &&
+      G_NODE (iter->user_data) == GTK_TREE_STORE (tree_model)->root)
+    return gtk_tree_path_new ();
+  g_assert (G_NODE (iter->user_data)->parent != NULL);
 
-  if (G_NODE (node)->parent == G_NODE (GTK_TREE_STORE (tree_model)->root))
+  if (G_NODE (iter->user_data)->parent == G_NODE (GTK_TREE_STORE (tree_model)->root))
     {
       retval = gtk_tree_path_new ();
       tmp_node = G_NODE (GTK_TREE_STORE (tree_model)->root)->children;
     }
   else
     {
+      GtkTreeIter tmp_iter = *iter;
+
+      tmp_iter.user_data = G_NODE (iter->user_data)->parent;
+
       retval = gtk_tree_store_get_path (tree_model,
-                                       G_NODE (node)->parent);
-      tmp_node = G_NODE (node)->parent->children;
+                                       &tmp_iter);
+      tmp_node = G_NODE (iter->user_data)->parent->children;
     }
 
   if (retval == NULL)
     return NULL;
+
   if (tmp_node == NULL)
     {
       gtk_tree_path_free (retval);
@@ -308,13 +511,15 @@ gtk_tree_store_get_path (GtkTreeModel *tree_model,
 
   for (; tmp_node; tmp_node = tmp_node->next)
     {
-      if (tmp_node == G_NODE (node))
+      if (tmp_node == G_NODE (iter->user_data))
        break;
       i++;
     }
+
   if (tmp_node == NULL)
     {
       /* We couldn't find node, meaning it's prolly not ours */
+      /* Perhaps I should do a g_return_if_fail here. */
       gtk_tree_path_free (retval);
       return NULL;
     }
@@ -326,125 +531,219 @@ gtk_tree_store_get_path (GtkTreeModel *tree_model,
 
 
 static void
-gtk_tree_store_node_get_value (GtkTreeModel *tree_model,
-                              GtkTreeNode   node,
-                              gint          column,
-                              GValue       *value)
+gtk_tree_store_get_value (GtkTreeModel *tree_model,
+                         GtkTreeIter  *iter,
+                         gint          column,
+                         GValue       *value)
 {
   GtkTreeDataList *list;
   gint tmp_column = column;
 
-  g_return_if_fail (tree_model != NULL);
   g_return_if_fail (GTK_IS_TREE_STORE (tree_model));
-  g_return_if_fail (node != NULL);
+  g_return_if_fail (iter != NULL);
   g_return_if_fail (column < GTK_TREE_STORE (tree_model)->n_columns);
 
-  list = G_NODE (node)->data;
+  list = G_NODE (iter->user_data)->data;
 
   while (tmp_column-- > 0 && list)
     list = list->next;
 
-  g_return_if_fail (list != NULL);
-
-  gtk_tree_data_list_node_to_value (list,
-                                   GTK_TREE_STORE (tree_model)->column_headers[column],
-                                   value);
+  if (list)
+    {
+      _gtk_tree_data_list_node_to_value (list,
+                                        GTK_TREE_STORE (tree_model)->column_headers[column],
+                                        value);
+    }
+  else
+    {
+      /* We want to return an initialized but empty (default) value */
+      g_value_init (value, GTK_TREE_STORE (tree_model)->column_headers[column]);
+    }
 }
 
 static gboolean
-gtk_tree_store_node_next (GtkTreeModel  *tree_model,
-                         GtkTreeNode   *node)
+gtk_tree_store_iter_next (GtkTreeModel  *tree_model,
+                         GtkTreeIter   *iter)
 {
-  if (node == NULL || *node == NULL)
-    return FALSE;
+  g_return_val_if_fail (iter->user_data != NULL, FALSE);
 
-  *node = (GtkTreeNode) G_NODE (*node)->next;
-  return (*node != NULL);
+  if (G_NODE (iter->user_data)->next)
+    {
+      iter->user_data = G_NODE (iter->user_data)->next;
+      return TRUE;
+    }
+  else
+    return FALSE;
 }
 
-static GtkTreeNode
-gtk_tree_store_node_children (GtkTreeModel *tree_model,
-                             GtkTreeNode   node)
+static gboolean
+gtk_tree_store_iter_children (GtkTreeModel *tree_model,
+                             GtkTreeIter  *iter,
+                             GtkTreeIter  *parent)
 {
-  return (GtkTreeNode) G_NODE (node)->children;
+  GNode *children;
+
+  g_return_val_if_fail (parent == NULL || parent->user_data != NULL, FALSE);
+
+  if (parent)
+    children = G_NODE (parent->user_data)->children;
+  else
+    children = G_NODE (GTK_TREE_STORE (tree_model)->root)->children;
+
+  if (children)
+    {
+      iter->stamp = GTK_TREE_STORE (tree_model)->stamp;
+      iter->user_data = children;
+      return TRUE;
+    }
+  else
+    return FALSE;
 }
 
 static gboolean
-gtk_tree_store_node_has_child (GtkTreeModel *tree_model,
-                              GtkTreeNode   node)
+gtk_tree_store_iter_has_child (GtkTreeModel *tree_model,
+                              GtkTreeIter  *iter)
 {
-  return G_NODE (node)->children != NULL;
+  g_return_val_if_fail (GTK_IS_TREE_STORE (tree_model), FALSE);
+  g_return_val_if_fail (iter != NULL, FALSE);
+  g_return_val_if_fail (iter->user_data != NULL, FALSE);
+
+  return G_NODE (iter->user_data)->children != NULL;
 }
 
 static gint
-gtk_tree_store_node_n_children (GtkTreeModel *tree_model,
-                               GtkTreeNode   node)
+gtk_tree_store_iter_n_children (GtkTreeModel *tree_model,
+                               GtkTreeIter  *iter)
 {
+  GNode *node;
   gint i = 0;
 
-  node = (GtkTreeNode) G_NODE (node)->children;
-  while (node != NULL)
+  g_return_val_if_fail (GTK_IS_TREE_STORE (tree_model), 0);
+  g_return_val_if_fail (iter == NULL || iter->user_data != NULL, FALSE);
+
+  if (iter == NULL)
+    node = G_NODE (GTK_TREE_STORE (tree_model)->root)->children;
+  else
+    node = G_NODE (iter->user_data)->children;
+
+  while (node)
     {
       i++;
-      node = (GtkTreeNode) G_NODE (node)->next;
+      node = node->next;
     }
 
   return i;
 }
 
-static GtkTreeNode
-gtk_tree_store_node_nth_child (GtkTreeModel *tree_model,
-                              GtkTreeNode   node,
+static gboolean
+gtk_tree_store_iter_nth_child (GtkTreeModel *tree_model,
+                              GtkTreeIter  *iter,
+                              GtkTreeIter  *parent,
                               gint          n)
 {
-  g_return_val_if_fail (node != NULL, NULL);
+  GNode *parent_node;
+  GNode *child;
 
-  return (GtkTreeNode) g_node_nth_child (G_NODE (node), n);
-}
+  g_return_val_if_fail (GTK_IS_TREE_STORE (tree_model), FALSE);
+  g_return_val_if_fail (parent == NULL || parent->user_data != NULL, FALSE);
 
-static GtkTreeNode
-gtk_tree_store_node_parent (GtkTreeModel *tree_model,
-                           GtkTreeNode   node)
-{
-  return (GtkTreeNode) G_NODE (node)->parent;
+  if (parent == NULL)
+    parent_node = GTK_TREE_STORE (tree_model)->root;
+  else
+    parent_node = parent->user_data;
+
+  child = g_node_nth_child (parent_node, n);
+
+  if (child)
+    {
+      iter->user_data = child;
+      iter->stamp = GTK_TREE_STORE (tree_model)->stamp;
+      return TRUE;
+    }
+  else
+    return FALSE;
 }
 
-/* Public accessors */
-GtkTreeNode
-gtk_tree_store_node_new (void)
+static gboolean
+gtk_tree_store_iter_parent (GtkTreeModel *tree_model,
+                           GtkTreeIter  *iter,
+                           GtkTreeIter  *child)
 {
-  GtkTreeNode retval;
+  GNode *parent;
 
-  retval = (GtkTreeNode) g_node_new (NULL);
-  return retval;
+  g_return_val_if_fail (iter != NULL, FALSE);
+  g_return_val_if_fail (iter->user_data != NULL, FALSE);
+
+  parent = G_NODE (child->user_data)->parent;
+
+  g_assert (parent != NULL);
+
+  if (parent != GTK_TREE_STORE (tree_model)->root)
+    {
+      iter->user_data = parent;
+      iter->stamp = GTK_TREE_STORE (tree_model)->stamp;
+      return TRUE;
+    }
+  else
+    return FALSE;
 }
 
-/*
- * This is a somewhat inelegant function that does a lot of list
- * manipulations on it's own.
- */
-void
-gtk_tree_store_node_set_cell (GtkTreeStore *tree_store,
-                             GtkTreeNode   node,
-                             gint          column,
-                             GValue       *value)
+
+/* Does not emit a signal */
+gboolean
+gtk_tree_store_real_set_value (GtkTreeStore *tree_store,
+                              GtkTreeIter  *iter,
+                              gint          column,
+                              GValue       *value)
 {
   GtkTreeDataList *list;
   GtkTreeDataList *prev;
+  GtkTreePath *path = NULL;
+  GValue real_value = {0, };
+  gboolean converted = FALSE;
+  gint orig_column = column;
+  gboolean retval = FALSE;
 
-  g_return_if_fail (tree_store != NULL);
-  g_return_if_fail (GTK_IS_TREE_STORE (tree_store));
-  g_return_if_fail (node != NULL);
-  g_return_if_fail (column >= 0 && column < tree_store->n_columns);
+  if (! g_type_is_a (G_VALUE_TYPE (value), tree_store->column_headers[column]))
+    {
+      if (! (g_value_type_compatible (G_VALUE_TYPE (value), tree_store->column_headers[column]) &&
+            g_value_type_compatible (tree_store->column_headers[column], G_VALUE_TYPE (value))))
+       {
+         g_warning ("%s: Unable to convert from %s to %s\n",
+                    G_STRLOC,
+                    g_type_name (G_VALUE_TYPE (value)),
+                    g_type_name (tree_store->column_headers[column]));
+         return retval;
+       }
+      if (!g_value_transform (value, &real_value))
+       {
+         g_warning ("%s: Unable to make conversion from %s to %s\n",
+                    G_STRLOC,
+                    g_type_name (G_VALUE_TYPE (value)),
+                    g_type_name (tree_store->column_headers[column]));
+         g_value_unset (&real_value);
+         return retval;
+       }
+      converted = TRUE;
+    }
 
-  prev = list = G_NODE (node)->data;
+  prev = list = G_NODE (iter->user_data)->data;
+
+  path = gtk_tree_store_get_path (GTK_TREE_MODEL (tree_store), iter);
 
   while (list != NULL)
     {
       if (column == 0)
        {
-         gtk_tree_data_list_value_to_node (list, value);
-         return;
+         if (converted)
+           _gtk_tree_data_list_value_to_node (list, &real_value);
+         else
+           _gtk_tree_data_list_value_to_node (list, value);
+         retval = TRUE;
+         gtk_tree_path_free (path);
+         if (converted)
+           g_value_unset (&real_value);
+         return retval;
        }
 
       column--;
@@ -452,261 +751,1339 @@ gtk_tree_store_node_set_cell (GtkTreeStore *tree_store,
       list = list->next;
     }
 
-  if (G_NODE (node)->data == NULL)
+  if (G_NODE (iter->user_data)->data == NULL)
     {
-      G_NODE (node)->data = list = gtk_tree_data_list_alloc ();
+      G_NODE (iter->user_data)->data = list = _gtk_tree_data_list_alloc ();
       list->next = NULL;
     }
   else
     {
-      list = prev->next = gtk_tree_data_list_alloc ();
+      list = prev->next = _gtk_tree_data_list_alloc ();
       list->next = NULL;
     }
 
   while (column != 0)
     {
-      list->next = gtk_tree_data_list_alloc ();
+      list->next = _gtk_tree_data_list_alloc ();
       list = list->next;
       list->next = NULL;
       column --;
     }
-  gtk_tree_data_list_value_to_node (list, value);
+  if (converted)
+    _gtk_tree_data_list_value_to_node (list, &real_value);
+  else
+    _gtk_tree_data_list_value_to_node (list, value);
+
+  gtk_tree_path_free (path);
+  if (converted)
+    g_value_unset (&real_value);
+
+  if (GTK_TREE_STORE_IS_SORTED (tree_store))
+    gtk_tree_store_sort_iter_changed (tree_store, iter, orig_column);
+
+  return retval;
 }
 
+/**
+ * gtk_tree_store_set_value:
+ * @tree_store: a #GtkTreeStore
+ * @iter: A valid #GtkTreeIter for the row being modified
+ * @column: column number to modify
+ * @value: new value for the cell
+ *
+ * Sets the data in the cell specified by @iter and @column.
+ * The type of @value must be convertible to the type of the
+ * column.
+ *
+ **/
 void
-gtk_tree_store_node_remove (GtkTreeStore *model,
-                           GtkTreeNode   node)
+gtk_tree_store_set_value (GtkTreeStore *tree_store,
+                         GtkTreeIter  *iter,
+                         gint          column,
+                         GValue       *value)
 {
-  GtkTreePath *path;
-  GNode *parent;
-
-  g_return_if_fail (model != NULL);
-  g_return_if_fail (GTK_IS_TREE_STORE (model));
-  g_return_if_fail (node != NULL);
-  /* FIXME: if node is NULL, do I want to free the tree? */
-
-  parent = G_NODE (node)->parent;
+  g_return_if_fail (GTK_IS_TREE_STORE (tree_store));
+  g_return_if_fail (VALID_ITER (iter, tree_store));
+  g_return_if_fail (column >= 0 && column < tree_store->n_columns);
+  g_return_if_fail (G_IS_VALUE (value));
 
-  path = gtk_tree_store_get_path (GTK_TREE_MODEL (model), node);
-  g_node_destroy (G_NODE (node));
-  gtk_signal_emit_by_name (GTK_OBJECT (model),
-                          "node_deleted",
-                          path);
-  if (parent != G_NODE (model->root) && parent->children == NULL)
+  if (gtk_tree_store_real_set_value (tree_store, iter, column, value))
     {
-      gtk_tree_path_up (path);
-      gtk_signal_emit_by_name (GTK_OBJECT (model),
-                              "node_child_toggled",
-                              path,
-                              parent);
+      GtkTreePath *path;
+
+      path = gtk_tree_model_get_path (GTK_TREE_MODEL (tree_store), iter);
+      gtk_tree_model_row_changed (GTK_TREE_MODEL (tree_store), path, iter);
+      gtk_tree_path_free (path);
     }
-  gtk_tree_path_free (path);
 }
 
-GtkTreeNode
-gtk_tree_store_node_insert (GtkTreeStore *model,
-                           GtkTreeNode   parent,
-                           gint          position,
-                           GtkTreeNode   node)
+/**
+ * gtk_tree_store_set_valist:
+ * @tree_store: A #GtkTreeStore
+ * @iter: A valid #GtkTreeIter for the row being modified
+ * @var_args: va_list of column/value pairs
+ *
+ * See @gtk_tree_store_set; this version takes a va_list for
+ * use by language bindings.
+ *
+ **/
+void
+gtk_tree_store_set_valist (GtkTreeStore *tree_store,
+                           GtkTreeIter  *iter,
+                           va_list     var_args)
 {
-  GtkTreePath *path;
+  gint column;
+  gboolean emit_signal = FALSE;
 
-  g_return_val_if_fail (model != NULL, node);
-  g_return_val_if_fail (GTK_IS_TREE_STORE (model), node);
-  g_return_val_if_fail (node != NULL, node);
+  g_return_if_fail (GTK_IS_TREE_STORE (tree_store));
+  g_return_if_fail (VALID_ITER (iter, tree_store));
 
-  if (parent == NULL)
-    parent = model->root;
+  column = va_arg (var_args, gint);
 
-  g_node_insert (G_NODE (parent), position, G_NODE (node));
+  while (column != -1)
+    {
+      GValue value = { 0, };
+      gchar *error = NULL;
 
-  path = gtk_tree_store_get_path (GTK_TREE_MODEL (model), node);
-  gtk_signal_emit_by_name (GTK_OBJECT (model),
-                          "node_inserted",
-                          path, node);
-  gtk_tree_path_free (path);
+      if (column >= tree_store->n_columns)
+       {
+         g_warning ("%s: Invalid column number %d added to iter (remember to end your list of columns with a -1)", G_STRLOC, column);
+         break;
+       }
+      g_value_init (&value, tree_store->column_headers[column]);
 
-  return node;
-}
+      G_VALUE_COLLECT (&value, var_args, 0, &error);
+      if (error)
+       {
+         g_warning ("%s: %s", G_STRLOC, error);
+         g_free (error);
 
-GtkTreeNode
-gtk_tree_store_node_insert_before (GtkTreeStore *model,
-                                  GtkTreeNode   parent,
-                                  GtkTreeNode   sibling,
-                                  GtkTreeNode   node)
-{
-  GtkTreePath *path;
+         /* we purposely leak the value here, it might not be
+          * in a sane state if an error condition occoured
+          */
+         break;
+       }
 
-  g_return_val_if_fail (model != NULL, node);
-  g_return_val_if_fail (GTK_IS_TREE_STORE (model), node);
-  g_return_val_if_fail (node != NULL, node);
+      emit_signal = gtk_tree_store_real_set_value (tree_store,
+                                                  iter,
+                                                  column,
+                                                  &value) || emit_signal;
 
-  if (parent == NULL && sibling == NULL)
-    parent = model->root;
+      g_value_unset (&value);
 
-  if (parent == NULL)
-    parent = (GtkTreeNode) G_NODE (sibling)->parent;
+      column = va_arg (var_args, gint);
+    }
+  if (emit_signal)
+    {
+      GtkTreePath *path;
 
-  g_node_insert_before (G_NODE (parent), G_NODE (sibling), G_NODE (node));
+      path = gtk_tree_model_get_path (GTK_TREE_MODEL (tree_store), iter);
+      gtk_tree_model_row_changed (GTK_TREE_MODEL (tree_store), path, iter);
+      gtk_tree_path_free (path);
+    }
+}
 
-  path = gtk_tree_store_get_path (GTK_TREE_MODEL (model), node);
-  gtk_signal_emit_by_name (GTK_OBJECT (model),
-                          "node_inserted",
-                          path, node);
-  gtk_tree_path_free (path);
+/**
+ * gtk_tree_store_set:
+ * @tree_store: A #GtkTreeStore
+ * @iter: A valid #GtkTreeIter for the row being modified
+ * @Varargs: pairs of column number and value, terminated with -1
+ *
+ * Sets the value of one or more cells in the row referenced by @iter.
+ * The variable argument list should contain integer column numbers,
+ * each column number followed by the value to be set. For example,
+ * The list is terminated by a -1. For example, to set column 0 with type
+ * %G_TYPE_STRING to "Foo", you would write gtk_tree_store_set (store, iter,
+ * 0, "Foo", -1).
+ **/
+void
+gtk_tree_store_set (GtkTreeStore *tree_store,
+                   GtkTreeIter  *iter,
+                   ...)
+{
+  va_list var_args;
+
+  g_return_if_fail (GTK_IS_TREE_STORE (tree_store));
+  g_return_if_fail (VALID_ITER (iter, tree_store));
 
-  return node;
+  va_start (var_args, iter);
+  gtk_tree_store_set_valist (tree_store, iter, var_args);
+  va_end (var_args);
 }
 
-GtkTreeNode
-gtk_tree_store_node_insert_after (GtkTreeStore *model,
-                                 GtkTreeNode   parent,
-                                 GtkTreeNode   sibling,
-                                 GtkTreeNode   node)
+/**
+ * gtk_tree_store_remove:
+ * @tree_store: A #GtkTreeStore
+ * @iter: A valid #GtkTreeIter
+ * 
+ * Removes @iter from @tree_store.  After being removed, @iter is set to the
+ * next valid row at that level, or invalidated if it previeously pointed to the last one.
+ **/
+void
+gtk_tree_store_remove (GtkTreeStore *tree_store,
+                      GtkTreeIter  *iter)
 {
   GtkTreePath *path;
+  GtkTreeIter new_iter = {0,};
+  GNode *parent;
+  GNode *next_node;
 
-  g_return_val_if_fail (model != NULL, node);
-  g_return_val_if_fail (GTK_IS_TREE_STORE (model), node);
-  g_return_val_if_fail (node != NULL, node);
-
-  if (parent == NULL && sibling == NULL)
-    parent = model->root;
+  g_return_if_fail (GTK_IS_TREE_STORE (tree_store));
+  g_return_if_fail (VALID_ITER (iter, tree_store));
 
-  if (parent == NULL)
-    parent = (GtkTreeNode) G_NODE (sibling)->parent;
+  parent = G_NODE (iter->user_data)->parent;
 
-  g_node_insert_after (G_NODE (parent), G_NODE (sibling), G_NODE (node));
+  g_assert (parent != NULL);
+  next_node = G_NODE (iter->user_data);
 
-  path = gtk_tree_store_get_path (GTK_TREE_MODEL (model), node);
-  gtk_signal_emit_by_name (GTK_OBJECT (model),
-                          "node_inserted",
-                          path, node);
-  gtk_tree_path_free (path);
-  return node;
-}
+  if (G_NODE (iter->user_data)->data)
+    _gtk_tree_data_list_free ((GtkTreeDataList *) G_NODE (iter->user_data)->data,
+                             tree_store->column_headers);
 
-GtkTreeNode
-gtk_tree_store_node_prepend (GtkTreeStore *model,
-                            GtkTreeNode   parent,
-                            GtkTreeNode   node)
-{
-  g_return_val_if_fail (model != NULL, node);
-  g_return_val_if_fail (GTK_IS_TREE_STORE (model), node);
-  g_return_val_if_fail (node != NULL, node);
+  path = gtk_tree_store_get_path (GTK_TREE_MODEL (tree_store), iter);
+  g_node_destroy (G_NODE (iter->user_data));
 
-  if (parent == NULL)
-    parent = model->root;
+  gtk_tree_model_row_deleted (GTK_TREE_MODEL (tree_store), path);
 
-  if (G_NODE (parent)->children == NULL)
+  if (parent != G_NODE (tree_store->root))
     {
-      GtkTreePath *path;
-      g_node_prepend (G_NODE (parent), G_NODE (node));
-      if (parent != model->root)
-       {
-         path = gtk_tree_store_get_path (GTK_TREE_MODEL (model), parent);
-         gtk_signal_emit_by_name (GTK_OBJECT (model),
-                                  "node_child_toggled",
-                                  path,
-                                  parent);
-         gtk_tree_path_append_index (path, 1);
-       }
-      else
+      /* child_toggled */
+      if (parent->children == NULL)
        {
-         path = gtk_tree_store_get_path (GTK_TREE_MODEL (model), G_NODE (parent)->children);
+         gtk_tree_path_up (path);
+
+         new_iter.stamp = tree_store->stamp;
+         new_iter.user_data = parent;
+         gtk_tree_model_row_has_child_toggled (GTK_TREE_MODEL (tree_store), path, &new_iter);
        }
-      gtk_signal_emit_by_name (GTK_OBJECT (model),
-                              "node_inserted",
-                              path,
-                              G_NODE (parent)->children);
-      gtk_tree_path_free (path);
     }
-  else
-    {
-      gtk_tree_store_node_insert_after (model,
-                                        parent == model->root?NULL:parent,
-                                        NULL,
-                                        node);
-    }
-  return node;
-}
-
-GtkTreeNode
-gtk_tree_store_node_append (GtkTreeStore *model,
-                           GtkTreeNode   parent,
-                           GtkTreeNode   node)
-{
-  g_return_val_if_fail (model != NULL, node);
-  g_return_val_if_fail (GTK_IS_TREE_STORE (model), node);
-  g_return_val_if_fail (node != NULL, node);
-
-  if (parent == NULL)
-    parent = model->root;
+  gtk_tree_path_free (path);
 
-  if (G_NODE (parent)->children == NULL)
+  /* revalidate iter */
+  if (next_node != NULL)
     {
-      GtkTreePath *path;
-      g_node_append (G_NODE (parent), G_NODE (node));
-      if (parent != model->root)
-       {
-         path = gtk_tree_store_get_path (GTK_TREE_MODEL (model), parent);
-         gtk_signal_emit_by_name (GTK_OBJECT (model),
-                                  "node_child_toggled",
-                                  path,
-                                  parent);
-         gtk_tree_path_append_index (path, 1);
-       }
-      else
-       {
-         path = gtk_tree_store_get_path (GTK_TREE_MODEL (model), G_NODE (parent)->children);
-       }
-      gtk_signal_emit_by_name (GTK_OBJECT (model),
-                              "node_inserted",
-                              path,
-                              G_NODE (parent)->children);
-      gtk_tree_path_free (path);
+      iter->stamp = tree_store->stamp;
+      iter->user_data = next_node;
     }
   else
     {
-      gtk_tree_store_node_insert_before (model,
-                                        parent == model->root?NULL:parent,
-                                        NULL,
-                                        node);
+      iter->stamp = 0;
     }
-  return node;
 }
 
-GtkTreeNode
-gtk_tree_store_node_get_root (GtkTreeStore *model)
+/**
+ * gtk_tree_store_insert:
+ * @tree_store: A #GtkListStore
+ * @iter: An unset #GtkTreeIter to set to the new row
+ * @parent: A valid #GtkTreeIter, or %NULL
+ * @position: position to insert the new row
+ *
+ * Creates a new row at @position.  If parent is non-NULL, then the row will be
+ * made a child of @parent.  Otherwise, the row will be created at the toplevel.
+ * If @position is larger than the number of rows at that level, then the new
+ * row will be inserted to the end of the list.  @iter will be changed to point
+ * to this new row.  The row will be empty before this function is called.  To
+ * fill in values, you need to call @gtk_list_store_set or
+ * @gtk_list_store_set_value.
+ *
+ **/
+void
+gtk_tree_store_insert (GtkTreeStore *tree_store,
+                      GtkTreeIter  *iter,
+                      GtkTreeIter  *parent,
+                      gint          position)
 {
-  g_return_val_if_fail (model != NULL, NULL);
-  g_return_val_if_fail (GTK_IS_TREE_STORE (model), NULL);
+  GtkTreePath *path;
+  GNode *parent_node;
 
-  return (GtkTreeNode) model->root;
-}
+  g_return_if_fail (GTK_IS_TREE_STORE (tree_store));
+  if (parent)
+    g_return_if_fail (VALID_ITER (parent, tree_store));
 
+  if (parent)
+    parent_node = parent->user_data;
+  else
+    parent_node = tree_store->root;
 
-gboolean
-gtk_tree_store_node_is_ancestor (GtkTreeStore *model,
-                                GtkTreeNode   node,
-                                GtkTreeNode   descendant)
-{
-  g_return_val_if_fail (model != NULL, FALSE);
-  g_return_val_if_fail (GTK_IS_TREE_STORE (model), FALSE);
-  g_return_val_if_fail (node != NULL, FALSE);
-  g_return_val_if_fail (descendant != NULL, FALSE);
+  iter->stamp = tree_store->stamp;
+  iter->user_data = g_node_new (NULL);
+  g_node_insert (parent_node, position, G_NODE (iter->user_data));
 
-  return g_node_is_ancestor (G_NODE (node), G_NODE (descendant));
-}
+  path = gtk_tree_store_get_path (GTK_TREE_MODEL (tree_store), iter);
+  gtk_tree_model_row_inserted (GTK_TREE_MODEL (tree_store), path, iter);
 
+  gtk_tree_path_free (path);
 
-gint
-gtk_tree_store_node_depth (GtkTreeStore *model,
-                          GtkTreeNode   node)
+  validate_tree ((GtkTreeStore*)tree_store);
+}
+
+/**
+ * gtk_tree_store_insert_before:
+ * @tree_store: A #GtkTreeStore
+ * @iter: An unset #GtkTreeIter to set to the new row
+ * @parent: A valid #GtkTreeIter, or %NULL
+ * @sibling: A valid #GtkTreeIter, or %NULL
+ *
+ * Inserts a new row before @sibling.  If @sibling is %NULL, then the row will
+ * be appended to the beginning of the @parent 's children.  If @parent and
+ * @sibling are %NULL, then the row will be appended to the toplevel.  If both
+ * @sibling and @parent are set, then @parent must be the parent of @sibling.
+ * When @sibling is set, @parent is optional.
+ *
+ * @iter will be changed to point to this new row.  The row will be empty after
+ * this function is called.  To fill in values, you need to call
+ * @gtk_tree_store_set or @gtk_tree_store_set_value.
+ *
+ **/
+void
+gtk_tree_store_insert_before (GtkTreeStore *tree_store,
+                             GtkTreeIter  *iter,
+                             GtkTreeIter  *parent,
+                             GtkTreeIter  *sibling)
+{
+  GtkTreePath *path;
+  GNode *parent_node = NULL;
+  GNode *new_node;
+
+  g_return_if_fail (GTK_IS_TREE_STORE (tree_store));
+  g_return_if_fail (iter != NULL);
+  if (parent != NULL)
+    g_return_if_fail (VALID_ITER (parent, tree_store));
+  if (sibling != NULL)
+    g_return_if_fail (VALID_ITER (sibling, tree_store));
+
+  new_node = g_node_new (NULL);
+
+  if (parent == NULL && sibling == NULL)
+    parent_node = tree_store->root;
+  else if (parent == NULL)
+    parent_node = G_NODE (sibling->user_data)->parent;
+  else if (sibling == NULL)
+    parent_node = G_NODE (parent->user_data);
+  else
+    {
+      g_return_if_fail (G_NODE (sibling->user_data)->parent == G_NODE (parent->user_data));
+      parent_node = G_NODE (parent->user_data);
+    }
+
+  g_node_insert_before (parent_node,
+                       sibling ? G_NODE (sibling->user_data) : NULL,
+                        new_node);
+
+  iter->stamp = tree_store->stamp;
+  iter->user_data = new_node;
+
+  path = gtk_tree_store_get_path (GTK_TREE_MODEL (tree_store), iter);
+  gtk_tree_model_row_inserted (GTK_TREE_MODEL (tree_store), path, iter);
+
+  gtk_tree_path_free (path);
+
+  validate_tree ((GtkTreeStore*)tree_store);
+}
+
+/**
+ * gtk_tree_store_insert_after:
+ * @tree_store: A #GtkTreeStore
+ * @iter: An unset #GtkTreeIter to set to the new row
+ * @parent: A valid #GtkTreeIter, or %NULL
+ * @sibling: A valid #GtkTreeIter, or %NULL
+ *
+ * Inserts a new row after @sibling.  If @sibling is %NULL, then the row will be
+ * prepended to the beginning of the @parent 's children.  If @parent and
+ * @sibling are %NULL, then the row will be prepended to the toplevel.  If both
+ * @sibling and @parent are set, then @parent must be the parent of @sibling.
+ * When @sibling is set, @parent is optional.
+ *
+ * @iter will be changed to point to this new row.  The row will be empty after
+ * this function is called.  To fill in values, you need to call
+ * @gtk_tree_store_set or @gtk_tree_store_set_value.
+ *
+ **/
+void
+gtk_tree_store_insert_after (GtkTreeStore *tree_store,
+                            GtkTreeIter  *iter,
+                            GtkTreeIter  *parent,
+                            GtkTreeIter  *sibling)
+{
+  GtkTreePath *path;
+  GNode *parent_node;
+  GNode *new_node;
+
+  g_return_if_fail (GTK_IS_TREE_STORE (tree_store));
+  g_return_if_fail (iter != NULL);
+  if (parent != NULL)
+    g_return_if_fail (VALID_ITER (parent, tree_store));
+  if (sibling != NULL)
+    g_return_if_fail (VALID_ITER (sibling, tree_store));
+
+  new_node = g_node_new (NULL);
+
+  if (parent == NULL && sibling == NULL)
+    parent_node = tree_store->root;
+  else if (parent == NULL)
+    parent_node = G_NODE (sibling->user_data)->parent;
+  else if (sibling == NULL)
+    parent_node = G_NODE (parent->user_data);
+  else
+    {
+      g_return_if_fail (G_NODE (sibling->user_data)->parent ==
+                        G_NODE (parent->user_data));
+      parent_node = G_NODE (parent->user_data);
+    }
+
+
+  g_node_insert_after (parent_node,
+                      sibling ? G_NODE (sibling->user_data) : NULL,
+                       new_node);
+
+  iter->stamp = tree_store->stamp;
+  iter->user_data = new_node;
+
+  path = gtk_tree_store_get_path (GTK_TREE_MODEL (tree_store), iter);
+  gtk_tree_model_row_inserted (GTK_TREE_MODEL (tree_store), path, iter);
+
+  gtk_tree_path_free (path);
+
+  validate_tree ((GtkTreeStore*)tree_store);
+}
+
+/**
+ * gtk_tree_store_prepend:
+ * @tree_store: A #GtkTreeStore
+ * @iter: An unset #GtkTreeIter to set to the prepended row
+ * @parent: A valid #GtkTreeIter, or %NULL
+ * 
+ * Prepends a new row to @tree_store.  If @parent is non-NULL, then it will prepend
+ * the new row before the last child of @parent, otherwise it will prepend a row
+ * to the top level.  @iter will be changed to point to this new row.  The row
+ * will be empty after this function is called.  To fill in values, you need to
+ * call @gtk_tree_store_set or @gtk_tree_store_set_value.
+ **/
+void
+gtk_tree_store_prepend (GtkTreeStore *tree_store,
+                       GtkTreeIter  *iter,
+                       GtkTreeIter  *parent)
+{
+  GNode *parent_node;
+
+  g_return_if_fail (GTK_IS_TREE_STORE (tree_store));
+  g_return_if_fail (iter != NULL);
+  if (parent != NULL)
+    g_return_if_fail (VALID_ITER (parent, tree_store));
+
+  if (parent == NULL)
+    parent_node = tree_store->root;
+  else
+    parent_node = parent->user_data;
+
+  if (parent_node->children == NULL)
+    {
+      GtkTreePath *path;
+      
+      iter->stamp = tree_store->stamp;
+      iter->user_data = g_node_new (NULL);
+
+      g_node_prepend (parent_node, iter->user_data);
+
+      path = gtk_tree_store_get_path (GTK_TREE_MODEL (tree_store), iter);
+      gtk_tree_model_row_inserted (GTK_TREE_MODEL (tree_store), path, iter);
+
+      if (parent_node != tree_store->root)
+       {
+         gtk_tree_path_up (path);
+         gtk_tree_model_row_has_child_toggled (GTK_TREE_MODEL (tree_store), path, parent);
+       }
+      gtk_tree_path_free (path);
+    }
+  else
+    {
+      gtk_tree_store_insert_after (tree_store, iter, parent, NULL);
+    }
+
+  validate_tree ((GtkTreeStore*)tree_store);
+}
+
+/**
+ * gtk_tree_store_append:
+ * @tree_store: A #GtkTreeStore
+ * @iter: An unset #GtkTreeIter to set to the appended row
+ * @parent: A valid #GtkTreeIter, or %NULL
+ * 
+ * Appends a new row to @tree_store.  If @parent is non-NULL, then it will append the
+ * new row after the last child of @parent, otherwise it will append a row to
+ * the top level.  @iter will be changed to point to this new row.  The row will
+ * be empty after this function is called.  To fill in values, you need to call
+ * @gtk_tree_store_set or @gtk_tree_store_set_value.
+ **/
+void
+gtk_tree_store_append (GtkTreeStore *tree_store,
+                      GtkTreeIter  *iter,
+                      GtkTreeIter  *parent)
+{
+  GNode *parent_node;
+
+  g_return_if_fail (GTK_IS_TREE_STORE (tree_store));
+  g_return_if_fail (iter != NULL);
+
+  if (parent != NULL)
+    g_return_if_fail (VALID_ITER (parent, tree_store));
+
+  if (parent == NULL)
+    parent_node = tree_store->root;
+  else
+    parent_node = parent->user_data;
+
+  if (parent_node->children == NULL)
+    {
+      GtkTreePath *path;
+
+      iter->stamp = tree_store->stamp;
+      iter->user_data = g_node_new (NULL);
+
+      g_node_append (parent_node, G_NODE (iter->user_data));
+
+      path = gtk_tree_store_get_path (GTK_TREE_MODEL (tree_store), iter);
+      gtk_tree_model_row_inserted (GTK_TREE_MODEL (tree_store), path, iter);
+
+      if (parent_node != tree_store->root)
+       {
+         gtk_tree_path_up (path);
+         gtk_tree_model_row_has_child_toggled (GTK_TREE_MODEL (tree_store), path, parent);
+       }
+      gtk_tree_path_free (path);
+    }
+  else
+    {
+      gtk_tree_store_insert_before (tree_store, iter, parent, NULL);
+    }
+
+  validate_tree ((GtkTreeStore*)tree_store);
+}
+
+/**
+ * gtk_tree_store_is_ancestor:
+ * @tree_store: A #GtkTreeStore
+ * @iter: A valid #GtkTreeIter
+ * @descendant: A valid #GtkTreeIter
+ * 
+ * Returns %TRUE if @iter is an ancestor of @descendant.  That is, @iter is the
+ * parent (or grandparent or great-grandparent) of @descendant.
+ * 
+ * Return value: %TRUE, if @iter is an ancestor of @descendant
+ **/
+gboolean
+gtk_tree_store_is_ancestor (GtkTreeStore *tree_store,
+                           GtkTreeIter  *iter,
+                           GtkTreeIter  *descendant)
+{
+  g_return_val_if_fail (GTK_IS_TREE_STORE (tree_store), FALSE);
+  g_return_val_if_fail (VALID_ITER (iter, tree_store), FALSE);
+  g_return_val_if_fail (VALID_ITER (descendant, tree_store), FALSE);
+
+  return g_node_is_ancestor (G_NODE (iter->user_data),
+                            G_NODE (descendant->user_data));
+}
+
+
+/**
+ * gtk_tree_store_iter_depth:
+ * @tree_store: A #GtkTreeStore
+ * @iter: A valid #GtkTreeIter
+ * 
+ * Returns the depth of @iter.  This will be 0 for anything on the root level, 1
+ * for anything down a level, etc.
+ * 
+ * Return value: The depth of @iter
+ **/
+gint
+gtk_tree_store_iter_depth (GtkTreeStore *tree_store,
+                          GtkTreeIter  *iter)
+{
+  g_return_val_if_fail (GTK_IS_TREE_STORE (tree_store), 0);
+  g_return_val_if_fail (VALID_ITER (iter, tree_store), 0);
+
+  return g_node_depth (G_NODE (iter->user_data)) - 1;
+}
+
+
+/**
+ * gtk_tree_store_clear:
+ * @tree_store: @ #GtkTreeStore
+ * 
+ * Removes all rows from @tree_store
+ **/
+void
+gtk_tree_store_clear (GtkTreeStore *tree_store)
+{
+  GtkTreeIter iter;
+
+  g_return_if_fail (GTK_IS_TREE_STORE (tree_store));
+
+  while (G_NODE (tree_store->root)->children)
+    {
+      iter.stamp = tree_store->stamp;
+      iter.user_data = G_NODE (tree_store->root)->children;
+      gtk_tree_store_remove (tree_store, &iter);
+    }
+}
+
+/* DND */
+
+
+static gboolean
+gtk_tree_store_drag_data_delete (GtkTreeDragSource *drag_source,
+                                 GtkTreePath       *path)
+{
+  GtkTreeIter iter;
+
+  g_return_val_if_fail (GTK_IS_TREE_STORE (drag_source), FALSE);
+
+  if (gtk_tree_model_get_iter (GTK_TREE_MODEL (drag_source),
+                               &iter,
+                               path))
+    {
+      gtk_tree_store_remove (GTK_TREE_STORE (drag_source),
+                             &iter);
+      return TRUE;
+    }
+  else
+    {
+      return FALSE;
+    }
+}
+
+static gboolean
+gtk_tree_store_drag_data_get (GtkTreeDragSource *drag_source,
+                              GtkTreePath       *path,
+                              GtkSelectionData  *selection_data)
+{
+  g_return_val_if_fail (GTK_IS_TREE_STORE (drag_source), FALSE);
+
+  /* Note that we don't need to handle the GTK_TREE_MODEL_ROW
+   * target, because the default handler does it for us, but
+   * we do anyway for the convenience of someone maybe overriding the
+   * default handler.
+   */
+
+  if (gtk_selection_data_set_tree_row (selection_data,
+                                       GTK_TREE_MODEL (drag_source),
+                                       path))
+    {
+      return TRUE;
+    }
+  else
+    {
+      /* FIXME handle text targets at least. */
+    }
+
+  return FALSE;
+}
+
+static void
+copy_node_data (GtkTreeStore *tree_store,
+                GtkTreeIter  *src_iter,
+                GtkTreeIter  *dest_iter)
+{
+  GtkTreeDataList *dl = G_NODE (src_iter->user_data)->data;
+  GtkTreeDataList *copy_head = NULL;
+  GtkTreeDataList *copy_prev = NULL;
+  GtkTreeDataList *copy_iter = NULL;
+  GtkTreePath *path;
+  gint col;
+
+  col = 0;
+  while (dl)
+    {
+      copy_iter = _gtk_tree_data_list_node_copy (dl, tree_store->column_headers[col]);
+
+      if (copy_head == NULL)
+        copy_head = copy_iter;
+
+      if (copy_prev)
+        copy_prev->next = copy_iter;
+
+      copy_prev = copy_iter;
+
+      dl = dl->next;
+      ++col;
+    }
+
+  G_NODE (dest_iter->user_data)->data = copy_head;
+
+  path = gtk_tree_store_get_path (GTK_TREE_MODEL (tree_store), dest_iter);
+  gtk_tree_model_row_changed (GTK_TREE_MODEL (tree_store), path, dest_iter);
+  gtk_tree_path_free (path);
+}
+
+static void
+recursive_node_copy (GtkTreeStore *tree_store,
+                     GtkTreeIter  *src_iter,
+                     GtkTreeIter  *dest_iter)
+{
+  GtkTreeIter child;
+  GtkTreeModel *model;
+
+  model = GTK_TREE_MODEL (tree_store);
+
+  copy_node_data (tree_store, src_iter, dest_iter);
+
+  if (gtk_tree_model_iter_children (model,
+                                    &child,
+                                    src_iter))
+    {
+      /* Need to create children and recurse. Note our
+       * dependence on persistent iterators here.
+       */
+      do
+        {
+          GtkTreeIter copy;
+
+          /* Gee, a really slow algorithm... ;-) FIXME */
+          gtk_tree_store_append (tree_store,
+                                 &copy,
+                                 dest_iter);
+
+          recursive_node_copy (tree_store, &child, &copy);
+        }
+      while (gtk_tree_model_iter_next (model, &child));
+    }
+}
+
+static gboolean
+gtk_tree_store_drag_data_received (GtkTreeDragDest   *drag_dest,
+                                   GtkTreePath       *dest,
+                                   GtkSelectionData  *selection_data)
+{
+  GtkTreeModel *tree_model;
+  GtkTreeStore *tree_store;
+  GtkTreeModel *src_model = NULL;
+  GtkTreePath *src_path = NULL;
+  gboolean retval = FALSE;
+
+  g_return_val_if_fail (GTK_IS_TREE_STORE (drag_dest), FALSE);
+
+  tree_model = GTK_TREE_MODEL (drag_dest);
+  tree_store = GTK_TREE_STORE (drag_dest);
+
+  validate_tree (tree_store);
+
+  if (gtk_selection_data_get_tree_row (selection_data,
+                                       &src_model,
+                                       &src_path) &&
+      src_model == tree_model)
+    {
+      /* Copy the given row to a new position */
+      GtkTreeIter src_iter;
+      GtkTreeIter dest_iter;
+      GtkTreePath *prev;
+
+      if (!gtk_tree_model_get_iter (src_model,
+                                    &src_iter,
+                                    src_path))
+        {
+          goto out;
+        }
+
+      /* Get the path to insert _after_ (dest is the path to insert _before_) */
+      prev = gtk_tree_path_copy (dest);
+
+      if (!gtk_tree_path_prev (prev))
+        {
+          GtkTreeIter dest_parent;
+          GtkTreePath *parent;
+          GtkTreeIter *dest_parent_p;
+
+          /* dest was the first spot at the current depth; which means
+           * we are supposed to prepend.
+           */
+
+          /* Get the parent, NULL if parent is the root */
+          dest_parent_p = NULL;
+          parent = gtk_tree_path_copy (dest);
+          if (gtk_tree_path_up (parent))
+            {
+              gtk_tree_model_get_iter (tree_model,
+                                       &dest_parent,
+                                       parent);
+              dest_parent_p = &dest_parent;
+            }
+          gtk_tree_path_free (parent);
+          parent = NULL;
+
+          gtk_tree_store_prepend (GTK_TREE_STORE (tree_model),
+                                  &dest_iter,
+                                  dest_parent_p);
+
+          retval = TRUE;
+        }
+      else
+        {
+          if (gtk_tree_model_get_iter (GTK_TREE_MODEL (tree_model),
+                                       &dest_iter,
+                                       prev))
+            {
+              GtkTreeIter tmp_iter = dest_iter;
+              gtk_tree_store_insert_after (GTK_TREE_STORE (tree_model),
+                                           &dest_iter,
+                                           NULL,
+                                           &tmp_iter);
+              retval = TRUE;
+
+            }
+        }
+
+      gtk_tree_path_free (prev);
+
+      /* If we succeeded in creating dest_iter, walk src_iter tree branch,
+       * duplicating it below dest_iter.
+       */
+
+      if (retval)
+        {
+          recursive_node_copy (tree_store,
+                               &src_iter,
+                               &dest_iter);
+        }
+    }
+  else
+    {
+      /* FIXME maybe add some data targets eventually, or handle text
+       * targets in the simple case.
+       */
+
+    }
+
+ out:
+
+  if (src_path)
+    gtk_tree_path_free (src_path);
+
+  return retval;
+}
+
+static gboolean
+gtk_tree_store_row_drop_possible (GtkTreeDragDest *drag_dest,
+                                  GtkTreeModel    *src_model,
+                                  GtkTreePath     *src_path,
+                                  GtkTreePath     *dest_path)
 {
-  g_return_val_if_fail (model != NULL, 0);
-  g_return_val_if_fail (GTK_IS_TREE_STORE (model), 0);
-  g_return_val_if_fail (node != NULL, 0);
+  /* can only drag to ourselves */
+  if (src_model != GTK_TREE_MODEL (drag_dest))
+    return FALSE;
+
+  /* Can't drop into ourself. */
+  if (gtk_tree_path_is_ancestor (src_path,
+                                 dest_path))
+    return FALSE;
 
-  return g_node_depth (G_NODE (node));
+  /* Can't drop if dest_path's parent doesn't exist */
+  {
+    GtkTreeIter iter;
+    GtkTreePath *tmp = gtk_tree_path_copy (dest_path);
+
+    /* if we can't go up, we know the parent exists, the root
+     * always exists.
+     */
+    if (gtk_tree_path_up (tmp))
+      {
+        if (!gtk_tree_model_get_iter (GTK_TREE_MODEL (drag_dest),
+                                      &iter, tmp))
+          {
+            if (tmp)
+              gtk_tree_path_free (tmp);
+            return FALSE;
+          }
+      }
+
+    if (tmp)
+      gtk_tree_path_free (tmp);
+  }
+
+  /* Can otherwise drop anywhere. */
+  return TRUE;
 }
+
+/* Sorting */
+typedef struct _SortTuple
+{
+  gint offset;
+  GNode *node;
+} SortTuple;
+
+static gint
+gtk_tree_store_compare_func (gconstpointer a,
+                            gconstpointer b,
+                            gpointer      user_data)
+{
+  GtkTreeStore *tree_store = user_data;
+  GNode *node_a;
+  GNode *node_b;
+  GtkTreeIterCompareFunc func;
+  gpointer data;
+
+  GtkTreeIter iter_a;
+  GtkTreeIter iter_b;
+  gint retval;
+
+  if (tree_store->sort_column_id != -1)
+    {
+      GtkTreeDataSortHeader *header;
+
+      header = _gtk_tree_data_list_get_header (tree_store->sort_list,
+                                              tree_store->sort_column_id);
+      g_return_val_if_fail (header != NULL, 0);
+      g_return_val_if_fail (header->func != NULL, 0);
+
+      func = header->func;
+      data = header->data;
+    }
+  else
+    {
+      g_return_val_if_fail (tree_store->default_sort_func != NULL, 0);
+      func = tree_store->default_sort_func;
+      data = tree_store->default_sort_data;
+    }
+
+  node_a = ((SortTuple *) a)->node;
+  node_b = ((SortTuple *) b)->node;
+
+  iter_a.stamp = tree_store->stamp;
+  iter_a.user_data = node_a;
+  iter_b.stamp = tree_store->stamp;
+  iter_b.user_data = node_b;
+
+  retval = (* func) (GTK_TREE_MODEL (user_data), &iter_a, &iter_b, data);
+
+  if (tree_store->order == GTK_SORT_DESCENDING)
+    {
+      if (retval > 0)
+       retval = -1;
+      else if (retval < 0)
+       retval = 1;
+    }
+  return retval;
+}
+
+static void
+gtk_tree_store_sort_helper (GtkTreeStore *tree_store,
+                           GNode        *parent,
+                           gboolean      recurse)
+{
+  GtkTreeIter iter;
+  GArray *sort_array;
+  GNode *node;
+  GNode *tmp_node;
+  gint list_length;
+  gint i;
+  gint *new_order;
+  GtkTreePath *path;
+
+  node = parent->children;
+  if (node == NULL || node->next == NULL)
+    return;
+
+  g_assert (GTK_TREE_STORE_IS_SORTED (tree_store));
+
+  list_length = 0;
+  for (tmp_node = node; tmp_node; tmp_node = tmp_node->next)
+    list_length++;
+
+  sort_array = g_array_sized_new (FALSE, FALSE, sizeof (SortTuple), list_length);
+
+  i = 0;
+  for (tmp_node = node; tmp_node; tmp_node = tmp_node->next)
+    {
+      SortTuple tuple;
+
+      tuple.offset = i;
+      tuple.node = tmp_node;
+      g_array_append_val (sort_array, tuple);
+      i++;
+    }
+
+  g_array_sort_with_data (sort_array, gtk_tree_store_compare_func, tree_store);
+
+  for (i = 0; i < list_length - 1; i++)
+    {
+      g_array_index (sort_array, SortTuple, i).node->next =
+       g_array_index (sort_array, SortTuple, i + 1).node;
+      g_array_index (sort_array, SortTuple, i + 1).node->prev =
+       g_array_index (sort_array, SortTuple, i).node;
+    }
+  g_array_index (sort_array, SortTuple, list_length - 1).node->next = NULL;
+  g_array_index (sort_array, SortTuple, 0).node->prev = NULL;
+  parent->children = g_array_index (sort_array, SortTuple, 0).node;
+
+  /* Let the world know about our new order */
+  new_order = g_new (gint, list_length);
+  for (i = 0; i < list_length; i++)
+    new_order[i] = g_array_index (sort_array, SortTuple, i).offset;
+
+  iter.stamp = tree_store->stamp;
+  iter.user_data = parent;
+  path = gtk_tree_store_get_path (GTK_TREE_MODEL (tree_store), &iter);
+  gtk_tree_model_rows_reordered (GTK_TREE_MODEL (tree_store),
+                                path, &iter, new_order);
+  gtk_tree_path_free (path);
+  g_free (new_order);
+  g_array_free (sort_array, TRUE);
+
+  if (recurse)
+    {
+      for (tmp_node = parent->children; tmp_node; tmp_node = tmp_node->next)
+       {
+         if (tmp_node->children)
+           gtk_tree_store_sort_helper (tree_store, tmp_node, TRUE);
+       }
+    }
+}
+
+static void
+gtk_tree_store_sort (GtkTreeStore *tree_store)
+{
+  if (tree_store->sort_column_id != -1)
+    {
+      GtkTreeDataSortHeader *header = NULL;
+
+      header = _gtk_tree_data_list_get_header (tree_store->sort_list, tree_store->sort_column_id);
+
+      /* We want to make sure that we have a function */
+      g_return_if_fail (header != NULL);
+      g_return_if_fail (header->func != NULL);
+    }
+  else
+    {
+      g_return_if_fail (tree_store->default_sort_func != NULL);
+    }
+
+  gtk_tree_store_sort_helper (tree_store, G_NODE (tree_store->root), TRUE);
+}
+
+static void
+gtk_tree_store_sort_iter_changed (GtkTreeStore *tree_store,
+                                 GtkTreeIter  *iter,
+                                 gint          column)
+{
+  GNode *prev = NULL;
+  GNode *next = NULL;
+  GNode *node;
+  GtkTreePath *tmp_path;
+  GtkTreeIter tmp_iter;
+  gint cmp_a = 0;
+  gint cmp_b = 0;
+  gint i;
+  gint old_location;
+  gint new_location;
+  gint *new_order;
+  gint length;
+  GtkTreeIterCompareFunc func;
+  gpointer data;
+
+  g_return_if_fail (G_NODE (iter->user_data)->parent != NULL);
+
+  tmp_iter.stamp = tree_store->stamp;
+  if (tree_store->sort_column_id != -1)
+    {
+      GtkTreeDataSortHeader *header;
+      header = _gtk_tree_data_list_get_header (tree_store->sort_list,
+                                              tree_store->sort_column_id);
+      g_return_if_fail (header != NULL);
+      g_return_if_fail (header->func != NULL);
+      func = header->func;
+      data = header->data;
+    }
+  else
+    {
+      g_return_if_fail (tree_store->default_sort_func != NULL);
+      func = tree_store->default_sort_func;
+      data = tree_store->default_sort_data;
+    }
+
+  /* If it's the built in function, we don't sort. */
+  if (func == gtk_tree_data_list_compare_func &&
+      tree_store->sort_column_id != column)
+    return;
+
+  old_location = 0;
+  node = G_NODE (iter->user_data)->parent->children;
+  /* First we find the iter, its prev, and its next */
+  while (node)
+    {
+      if (node == G_NODE (iter->user_data))
+       break;
+      old_location++;
+      node = node->next;
+    }
+  g_assert (node != NULL);
+
+  prev = node->prev;
+  next = node->next;
+
+  /* Check the common case, where we don't need to sort it moved. */
+  if (prev != NULL)
+    {
+      tmp_iter.user_data = prev;
+      cmp_a = (* func) (GTK_TREE_MODEL (tree_store), &tmp_iter, iter, data);
+    }
+
+  if (next != NULL)
+    {
+      tmp_iter.user_data = next;
+      cmp_b = (* func) (GTK_TREE_MODEL (tree_store), iter, &tmp_iter, data);
+    }
+
+
+  if (tree_store->order == GTK_SORT_DESCENDING)
+    {
+      if (cmp_a < 0)
+       cmp_a = 1;
+      else if (cmp_a > 0)
+       cmp_a = -1;
+
+      if (cmp_b < 0)
+       cmp_b = 1;
+      else if (cmp_b > 0)
+       cmp_b = -1;
+    }
+
+  if (prev == NULL && cmp_b <= 0)
+    return;
+  else if (next == NULL && cmp_a <= 0)
+    return;
+  else if (prev != NULL && next != NULL &&
+          cmp_a <= 0 && cmp_b <= 0)
+    return;
+
+  /* We actually need to sort it */
+  /* First, remove the old link. */
+
+  if (prev)
+    prev->next = next;
+  else
+    node->parent->children = next;
+  if (next)
+    next->prev = prev;
+
+  node->prev = NULL;
+  node->next = NULL;
+
+  /* FIXME: as an optimization, we can potentially start at next */
+  prev = NULL;
+  node = node->parent->children;
+  new_location = 0;
+  tmp_iter.user_data = node;
+  if (tree_store->order == GTK_SORT_DESCENDING)
+    cmp_a = (* func) (GTK_TREE_MODEL (tree_store), &tmp_iter, iter, data);
+  else
+    cmp_a = (* func) (GTK_TREE_MODEL (tree_store), iter, &tmp_iter, data);
+
+  while ((node->next) && (cmp_a > 0))
+    {
+      prev = node;
+      node = node->next;
+      new_location++;
+      tmp_iter.user_data = node;
+      if (tree_store->order == GTK_SORT_DESCENDING)
+       cmp_a = (* func) (GTK_TREE_MODEL (tree_store), &tmp_iter, iter, data);
+      else
+       cmp_a = (* func) (GTK_TREE_MODEL (tree_store), iter, &tmp_iter, data);
+    }
+
+  if ((!node->next) && (cmp_a > 0))
+    {
+      node->next = G_NODE (iter->user_data);
+      node->next->prev = node;
+    }
+  else if (prev)
+    {
+      prev->next = G_NODE (iter->user_data);
+      prev->next->prev = prev;
+      G_NODE (iter->user_data)->next = node;
+      G_NODE (iter->user_data)->next->prev = G_NODE (iter->user_data);
+    }
+  else
+    {
+      G_NODE (iter->user_data)->next = G_NODE (iter->user_data)->parent->children;
+      G_NODE (iter->user_data)->parent->children = G_NODE (iter->user_data);
+    }
+
+  /* Emit the reordered signal. */
+  length = g_node_n_children (node->parent);
+  new_order = g_new (int, length);
+  if (old_location < new_location)
+    for (i = 0; i < length; i++)
+      {
+       if (i < old_location ||
+           i > new_location)
+         new_order[i] = i;
+       else if (i >= old_location &&
+                i < new_location)
+         new_order[i] = i + 1;
+       else if (i == new_location)
+         new_order[i] = old_location;
+      }
+  else
+    for (i = 0; i < length; i++)
+      {
+       if (i < new_location ||
+           i > old_location)
+         new_order[i] = i;
+       else if (i > new_location &&
+                i <= old_location)
+         new_order[i] = i - 1;
+       else if (i == new_location)
+         new_order[i] = old_location;
+      }
+
+  tmp_iter.user_data = node->parent;
+  tmp_path = gtk_tree_store_get_path (GTK_TREE_MODEL (tree_store), &tmp_iter);
+
+  gtk_tree_model_rows_reordered (GTK_TREE_MODEL (tree_store),
+                                tmp_path, &tmp_iter,
+                                new_order);
+
+  gtk_tree_path_free (tmp_path);
+  g_free (new_order);
+}
+
+
+static gboolean
+gtk_tree_store_get_sort_column_id (GtkTreeSortable  *sortable,
+                                  gint             *sort_column_id,
+                                  GtkSortType      *order)
+{
+  GtkTreeStore *tree_store = (GtkTreeStore *) sortable;
+
+  g_return_val_if_fail (GTK_IS_TREE_STORE (sortable), FALSE);
+
+  if (tree_store->sort_column_id == -1)
+    return FALSE;
+
+  if (sort_column_id)
+    * sort_column_id = tree_store->sort_column_id;
+  if (order)
+    * order = tree_store->order;
+  return TRUE;
+
+}
+
+static void
+gtk_tree_store_set_sort_column_id (GtkTreeSortable  *sortable,
+                                  gint              sort_column_id,
+                                  GtkSortType       order)
+{
+  GtkTreeStore *tree_store = (GtkTreeStore *) sortable;
+
+  g_return_if_fail (GTK_IS_TREE_STORE (sortable));
+
+  
+  if ((tree_store->sort_column_id == sort_column_id) &&
+      (tree_store->order == order))
+    return;
+
+  if (sort_column_id != -1)
+    {
+      GtkTreeDataSortHeader *header = NULL;
+
+      header = _gtk_tree_data_list_get_header (tree_store->sort_list, sort_column_id);
+
+      /* We want to make sure that we have a function */
+      g_return_if_fail (header != NULL);
+      g_return_if_fail (header->func != NULL);
+    }
+  else
+    {
+      g_return_if_fail (tree_store->default_sort_func != NULL);
+    }
+
+  tree_store->sort_column_id = sort_column_id;
+  tree_store->order = order;
+
+  gtk_tree_store_sort (tree_store);
+
+  gtk_tree_sortable_sort_column_changed (sortable);
+}
+
+static void
+gtk_tree_store_set_sort_func (GtkTreeSortable        *sortable,
+                             gint                    sort_column_id,
+                             GtkTreeIterCompareFunc  func,
+                             gpointer                data,
+                             GtkDestroyNotify        destroy)
+{
+  GtkTreeStore *tree_store = (GtkTreeStore *) sortable;
+  GtkTreeDataSortHeader *header = NULL;
+  GList *list;
+
+  g_return_if_fail (GTK_IS_TREE_STORE (sortable));
+  g_return_if_fail (func != NULL);
+
+  for (list = tree_store->sort_list; list; list = list->next)
+    {
+      header = (GtkTreeDataSortHeader*) list->data;
+      if (header->sort_column_id == sort_column_id)
+       break;
+    }
+
+  if (header == NULL)
+    {
+      header = g_new0 (GtkTreeDataSortHeader, 1);
+      header->sort_column_id = sort_column_id;
+      tree_store->sort_list = g_list_append (tree_store->sort_list, header);
+    }
+
+  if (header->destroy)
+    (* header->destroy) (header->data);
+
+  header->func = func;
+  header->data = data;
+  header->destroy = destroy;
+
+}
+
+static void
+gtk_tree_store_set_default_sort_func (GtkTreeSortable        *sortable,
+                                     GtkTreeIterCompareFunc  func,
+                                     gpointer                data,
+                                     GtkDestroyNotify        destroy)
+{
+  GtkTreeStore *tree_store = (GtkTreeStore *) sortable;
+
+  g_return_if_fail (GTK_IS_TREE_STORE (sortable));
+
+  if (tree_store->default_sort_destroy)
+    (* tree_store->default_sort_destroy) (tree_store->default_sort_data);
+
+  tree_store->default_sort_func = func;
+  tree_store->default_sort_data = data;
+  tree_store->default_sort_destroy = destroy;
+}
+
+static gboolean
+gtk_tree_store_has_default_sort_func (GtkTreeSortable *sortable)
+{
+  GtkTreeStore *tree_store = (GtkTreeStore *) sortable;
+
+  g_return_val_if_fail (GTK_IS_TREE_STORE (sortable), FALSE);
+
+  return (tree_store->default_sort_func != NULL);
+}
+
+static void
+validate_gnode (GNode* node)
+{
+  GNode *iter;
+
+  iter = node->children;
+  while (iter != NULL)
+    {
+      g_assert (iter->parent == node);
+      if (iter->prev)
+        g_assert (iter->prev->next == iter);
+      validate_gnode (iter);
+      iter = iter->next;
+    }
+}
+
+
+