handle case where there are no rows in the model

2001-01-09  Havoc Pennington  <hp@redhat.com>

	* gtk/gtktreeview.c (gtk_tree_view_check_dirty): handle case where
	there are no rows in the model

	* gtk/gtkliststore.c (gtk_list_store_iter_children): if parent is
	NULL, then return the start of the list

	* gtk/gtktreeview.c (gtk_tree_view_setup_model): don't build tree
	if we can't get any rows from an empty model

	* gtk/gtktreeviewcolumn.h (struct _GtkTreeViewColumn): remove
	extraneous * after function pointer typedef usage

	* Makefile.am: don't specify full path to cp and rm

	* gtk/gtkcellrenderertextpixbuf.c
	(gtk_cell_renderer_text_pixbuf_get_size): check width/height !=
	NULL before dereferencing, fixes a segfault that happened from
	time to time

	* gtk/gtkcellrendererpixbuf.c (gtk_cell_renderer_pixbuf_render):
	use gdk_pixbuf_render_to_drawable_alpha() to get alpha channel,
	and reindent the function
	(gtk_cell_renderer_pixbuf_get_size): indentation

	* gtk/gtkdialog.c (gtk_dialog_run): destroy main loop only after
	we quit it
	(gtk_dialog_add_buttons_valist): add g_return_if_fail
	(gtk_dialog_set_default_response): New function, to set default
	button
	(gtk_dialog_set_response_sensitive): New function, to set
	sensitivity of buttons

	* gtk/gtkcellrendererpixbuf.c
	(gtk_cell_renderer_pixbuf_get_property): allow getting a NULL pixbuf
	(gtk_cell_renderer_pixbuf_set_property): allow setting a NULL pixbuf

	* gtk/gtktreedatalist.c (_gtk_tree_data_list_node_to_value):
	handle any G_TYPE_OBJECT subclass, not just the base class, and
	also boxed types.
	(_gtk_tree_data_list_value_to_node): ditto

	* gtk/gtkrbtree.c: Run _gtk_rbtree_test at strategic points if
	--gtk-debug=tree

	* gtk/gtkmain.c: add GTK_DEBUG_TREE

	* gtk/gtkdebug.h: add GTK_DEBUG_TREE

12 files changed, 210 insertions, 108 deletions

diff --git a/gtk/gtkcellrendererpixbuf.c b/gtk/gtkcellrendererpixbuf.c
index fa21e59e8c..61a5572370 100644
--- a/gtk/gtkcellrendererpixbuf.c
+++ b/gtk/gtkcellrendererpixbuf.c
@@ -117,7 +117,8 @@ gtk_cell_renderer_pixbuf_get_property (GObject        *object,
   switch (param_id)
     {
     case PROP_PIXBUF:
-      g_value_set_object (value, G_OBJECT (cellpixbuf->pixbuf));
+      g_value_set_object (value,
+                          cellpixbuf->pixbuf ? G_OBJECT (cellpixbuf->pixbuf) : NULL);
       break;
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec);
@@ -139,8 +140,9 @@ gtk_cell_renderer_pixbuf_set_property (GObject      *object,
   switch (param_id)
     {
     case PROP_PIXBUF:
-      pixbuf = GDK_PIXBUF (g_value_get_object (value));
-      g_object_ref (G_OBJECT (pixbuf));
+      pixbuf = (GdkPixbuf*) g_value_get_object (value);
+      if (pixbuf)
+        g_object_ref (G_OBJECT (pixbuf));
       if (cellpixbuf->pixbuf)
 	g_object_unref (G_OBJECT (cellpixbuf->pixbuf));
       cellpixbuf->pixbuf = pixbuf;
@@ -154,7 +156,7 @@ gtk_cell_renderer_pixbuf_set_property (GObject      *object,
 GtkCellRenderer *
 gtk_cell_renderer_pixbuf_new (void)
 {
-	return GTK_CELL_RENDERER (gtk_type_new (gtk_cell_renderer_pixbuf_get_type ()));
+  return GTK_CELL_RENDERER (gtk_type_new (gtk_cell_renderer_pixbuf_get_type ()));
 }
 
 static void
@@ -163,15 +165,15 @@ gtk_cell_renderer_pixbuf_get_size (GtkCellRenderer *cell,
 				   gint            *width,
 				   gint            *height)
 {
-	GtkCellRendererPixbuf *cellpixbuf = (GtkCellRendererPixbuf *) cell;
-
-	if (width)
-		*width = (gint) GTK_CELL_RENDERER (cellpixbuf)->xpad * 2 +
-			(cellpixbuf->pixbuf ? gdk_pixbuf_get_width (cellpixbuf->pixbuf) : 0);
-
-	if (height)
-		*height = (gint) GTK_CELL_RENDERER (cellpixbuf)->ypad * 2 +
-			(cellpixbuf->pixbuf ? gdk_pixbuf_get_height (cellpixbuf->pixbuf) : 0);
+  GtkCellRendererPixbuf *cellpixbuf = (GtkCellRendererPixbuf *) cell;
+  
+  if (width)
+    *width = (gint) GTK_CELL_RENDERER (cellpixbuf)->xpad * 2 +
+      (cellpixbuf->pixbuf ? gdk_pixbuf_get_width (cellpixbuf->pixbuf) : 0);
+  
+  if (height)
+    *height = (gint) GTK_CELL_RENDERER (cellpixbuf)->ypad * 2 +
+      (cellpixbuf->pixbuf ? gdk_pixbuf_get_height (cellpixbuf->pixbuf) : 0);
 }
 
 static void
@@ -184,54 +186,45 @@ gtk_cell_renderer_pixbuf_render (GtkCellRenderer    *cell,
 				 guint               flags)
 
 {
-	GtkCellRendererPixbuf *cellpixbuf = (GtkCellRendererPixbuf *) cell;
-	GdkPixbuf *pixbuf;
-	guchar *pixels;
-	gint rowstride;
-	gint real_xoffset;
-	gint real_yoffset;
-	GdkGC *bg_gc = NULL;
-
-	pixbuf = cellpixbuf->pixbuf;
-
-	if (!pixbuf)
-		return;
-
-	if ((flags & GTK_CELL_RENDERER_SELECTED) == GTK_CELL_RENDERER_SELECTED)
-		bg_gc = widget->style->bg_gc [GTK_STATE_SELECTED];
-	else
-		bg_gc = widget->style->base_gc [GTK_STATE_NORMAL];
-
-	gdk_gc_set_clip_rectangle (bg_gc, cell_area);
-
-	rowstride = gdk_pixbuf_get_rowstride (pixbuf);
-	pixels = gdk_pixbuf_get_pixels (pixbuf);
-
-	real_xoffset = GTK_CELL_RENDERER (cellpixbuf)->xalign * (cell_area->width - gdk_pixbuf_get_width (pixbuf) - (2 * GTK_CELL_RENDERER (cellpixbuf)->xpad));
-	real_xoffset = MAX (real_xoffset, 0) + GTK_CELL_RENDERER (cellpixbuf)->xpad;
-	real_yoffset = GTK_CELL_RENDERER (cellpixbuf)->yalign * (cell_area->height - gdk_pixbuf_get_height (pixbuf) - (2 * GTK_CELL_RENDERER (cellpixbuf)->ypad));
-	real_yoffset = MAX (real_yoffset, 0) + GTK_CELL_RENDERER (cellpixbuf)->ypad;
-
-	if (gdk_pixbuf_get_has_alpha (pixbuf))
-		gdk_draw_rgb_32_image (window,
-				       bg_gc,
-				       cell_area->x + real_xoffset,
-				       cell_area->y + real_yoffset,
-				       gdk_pixbuf_get_width (pixbuf),
-				       gdk_pixbuf_get_height (pixbuf),
-				       GDK_RGB_DITHER_NORMAL,
-				       pixels,
-				       rowstride);
-	else
-		gdk_draw_rgb_image (window,
-				    bg_gc,
-				    cell_area->x + real_xoffset,
-				    cell_area->y + real_yoffset,
-				    gdk_pixbuf_get_width (pixbuf),
-				    gdk_pixbuf_get_height (pixbuf),
-				    GDK_RGB_DITHER_NORMAL,
-				    pixels,
-				    rowstride);
-
-	gdk_gc_set_clip_rectangle (bg_gc, NULL);
+  GtkCellRendererPixbuf *cellpixbuf = (GtkCellRendererPixbuf *) cell;
+  GdkPixbuf *pixbuf;
+  guchar *pixels;
+  gint rowstride;
+  gint real_xoffset;
+  gint real_yoffset;
+  GdkRectangle pix_rect;
+  GdkRectangle draw_rect;
+
+  pixbuf = cellpixbuf->pixbuf;
+
+  if (!pixbuf)
+    return;
+
+  rowstride = gdk_pixbuf_get_rowstride (pixbuf);
+  pixels = gdk_pixbuf_get_pixels (pixbuf);
+
+  real_xoffset = GTK_CELL_RENDERER (cellpixbuf)->xalign * (cell_area->width - gdk_pixbuf_get_width (pixbuf) - (2 * GTK_CELL_RENDERER (cellpixbuf)->xpad));
+  real_xoffset = MAX (real_xoffset, 0) + GTK_CELL_RENDERER (cellpixbuf)->xpad;
+  real_yoffset = GTK_CELL_RENDERER (cellpixbuf)->yalign * (cell_area->height - gdk_pixbuf_get_height (pixbuf) - (2 * GTK_CELL_RENDERER (cellpixbuf)->ypad));
+  real_yoffset = MAX (real_yoffset, 0) + GTK_CELL_RENDERER (cellpixbuf)->ypad;
+
+  pix_rect.x = cell_area->x + real_xoffset;
+  pix_rect.y = cell_area->y + real_yoffset;
+  pix_rect.width = gdk_pixbuf_get_width (pixbuf);
+  pix_rect.height = gdk_pixbuf_get_height (pixbuf);
+
+  if (gdk_rectangle_intersect (cell_area, &pix_rect, &draw_rect))
+    gdk_pixbuf_render_to_drawable_alpha (pixbuf,
+                                         window,
+                                         /* pixbuf 0, 0 is at pix_rect.x, pix_rect.y */
+                                         draw_rect.x - pix_rect.x,
+                                         draw_rect.y - pix_rect.y,
+                                         draw_rect.x,
+                                         draw_rect.y,
+                                         draw_rect.width,
+                                         draw_rect.height,
+                                         GDK_PIXBUF_ALPHA_FULL,
+                                         0,
+                                         GDK_RGB_DITHER_NORMAL,
+                                         0, 0);
 }
diff --git a/gtk/gtkcellrenderertextpixbuf.c b/gtk/gtkcellrenderertextpixbuf.c
index 712754fcfd..8d8fe804bb 100644
--- a/gtk/gtkcellrenderertextpixbuf.c
+++ b/gtk/gtkcellrenderertextpixbuf.c
@@ -301,13 +301,17 @@ gtk_cell_renderer_text_pixbuf_get_size (GtkCellRenderer *cell,
   if (celltextpixbuf->pixbuf_pos == GTK_POS_LEFT ||
       celltextpixbuf->pixbuf_pos == GTK_POS_RIGHT)
     {
-      *width = pixbuf_width + text_width;
-      *height = MAX (pixbuf_height, text_height);
+      if (width)
+        *width = pixbuf_width + text_width;
+      if (height)
+        *height = MAX (pixbuf_height, text_height);
     }
   else
     {
-      *width = MAX (pixbuf_width, text_width);
-      *height = pixbuf_height + text_height;
+      if (width)
+        *width = MAX (pixbuf_width, text_width);
+      if (height)
+        *height = pixbuf_height + text_height;
     }
 }
 
diff --git a/gtk/gtkdebug.h b/gtk/gtkdebug.h
index 9b7933f66a..78e74d16b5 100644
--- a/gtk/gtkdebug.h
+++ b/gtk/gtkdebug.h
@@ -37,7 +37,8 @@ typedef enum {
   GTK_DEBUG_SIGNALS    = 1 << 2,
   GTK_DEBUG_DND        = 1 << 3,
   GTK_DEBUG_PLUGSOCKET = 1 << 4,
-  GTK_DEBUG_TEXT =       1 << 5
+  GTK_DEBUG_TEXT       = 1 << 5,
+  GTK_DEBUG_TREE       = 1 << 6
 } GtkDebugFlag;
 
 #ifdef G_ENABLE_DEBUG
diff --git a/gtk/gtkdialog.c b/gtk/gtkdialog.c
index 491e3ae17c..0f13d57a4e 100644
--- a/gtk/gtkdialog.c
+++ b/gtk/gtkdialog.c
@@ -410,6 +410,8 @@ gtk_dialog_add_buttons_valist(GtkDialog      *dialog,
   const gchar* text;
   gint response_id;
 
+  g_return_if_fail (GTK_IS_DIALOG (dialog));
+  
   if (first_button_text == NULL)
     return;
   
@@ -443,8 +445,7 @@ void
 gtk_dialog_add_buttons (GtkDialog   *dialog,
                         const gchar *first_button_text,
                         ...)
-{
-  
+{  
   va_list args;
 
   va_start (args, first_button_text);
@@ -457,6 +458,78 @@ gtk_dialog_add_buttons (GtkDialog   *dialog,
 }
 
 /**
+ * gtk_dialog_set_response_sensitive:
+ * @dialog: a #GtkDialog
+ * @response_id: a response ID
+ * @setting: %TRUE for sensitive
+ *
+ * Calls gtk_widget_set_sensitive (widget, @setting) for each
+ * widget in the dialog's action area with the given @response_id.
+ * A convenient way to sensitize/desensitize dialog buttons.
+ * 
+ **/
+void
+gtk_dialog_set_response_sensitive (GtkDialog *dialog,
+                                   gint       response_id,
+                                   gboolean   setting)
+{
+  GList *children;
+  GList *tmp_list;
+
+  children = gtk_container_children (GTK_CONTAINER (dialog));
+
+  tmp_list = children;
+  while (tmp_list != NULL)
+    {
+      GtkWidget *widget = tmp_list->data;
+      ResponseData *rd = g_object_get_data (G_OBJECT (widget),
+                                            "gtk-dialog-response-data");
+
+      if (rd && rd->response_id == response_id)
+        gtk_widget_set_sensitive (widget, setting);
+
+      tmp_list = g_list_next (tmp_list);
+    }
+
+  g_list_free (children);
+}
+
+/**
+ * gtk_dialog_set_default_response:
+ * @dialog: a #GtkDialog
+ * @response_id: a response ID
+ * 
+ * Sets the last widget in the dialog's action area with the given @response_id
+ * as the default widget for the dialog. Pressing "Enter" normally activates
+ * the default widget.
+ * 
+ **/
+void
+gtk_dialog_set_default_response (GtkDialog *dialog,
+                                 gint       response_id)
+{
+  GList *children;
+  GList *tmp_list;
+
+  children = gtk_container_children (GTK_CONTAINER (dialog));
+
+  tmp_list = children;
+  while (tmp_list != NULL)
+    {
+      GtkWidget *widget = tmp_list->data;
+      ResponseData *rd = g_object_get_data (G_OBJECT (widget),
+                                            "gtk-dialog-response-data");
+
+      if (rd && rd->response_id == response_id)
+        gtk_widget_grab_default (widget);
+
+      tmp_list = g_list_next (tmp_list);
+    }
+
+  g_list_free (children);
+}
+
+/**
  * gtk_dialog_response:
  * @dialog: a #GtkDialog
  * @response_id: response ID 
@@ -488,12 +561,8 @@ typedef struct
 static void
 shutdown_loop (RunInfo *ri)
 {
-  if (ri->loop != NULL)
-    {
-      g_main_quit (ri->loop);
-      g_main_destroy (ri->loop);
-      ri->loop = NULL;
-    }
+  if (g_main_loop_is_running (ri->loop))
+    g_main_loop_quit (ri->loop);
 }
 
 static void
@@ -615,9 +684,11 @@ gtk_dialog_run (GtkDialog *dialog)
   
   ri.loop = g_main_new (FALSE);
 
-  g_main_run (ri.loop);
-  
-  g_assert (ri.loop == NULL);
+  g_main_loop_run (ri.loop);
+
+  g_main_loop_unref (ri.loop);
+
+  ri.loop = NULL;
   
   if (!GTK_OBJECT_DESTROYED (dialog))
     {
diff --git a/gtk/gtkdialog.h b/gtk/gtkdialog.h
index 6135908d05..fc0c178299 100644
--- a/gtk/gtkdialog.h
+++ b/gtk/gtkdialog.h
@@ -44,7 +44,7 @@ typedef enum
 
 } GtkDialogFlags;
 
-/* Convenience enum to use for action_id's.  Positive values are
+/* Convenience enum to use for response_id's.  Positive values are
  * totally user-interpreted. GTK will sometimes return
  * GTK_RESPONSE_NONE if no response_id is available.
  *
@@ -128,6 +128,12 @@ void       gtk_dialog_add_buttons       (GtkDialog   *dialog,
                                          const gchar *first_button_text,
                                          ...);
 
+void gtk_dialog_set_response_sensitive (GtkDialog *dialog,
+                                        gint       response_id,
+                                        gboolean   setting);
+void gtk_dialog_set_default_response   (GtkDialog *dialog,
+                                        gint       response_id);
+
 /* Emit response signal */
 void gtk_dialog_response           (GtkDialog *dialog,
                                     gint       response_id);
diff --git a/gtk/gtkliststore.c b/gtk/gtkliststore.c
index 88d3c6fd53..8c6b4cff16 100644
--- a/gtk/gtkliststore.c
+++ b/gtk/gtkliststore.c
@@ -355,10 +355,18 @@ gtk_list_store_iter_children (GtkTreeModel *tree_model,
 			      GtkTreeIter  *iter,
 			      GtkTreeIter  *parent)
 {
-  iter->stamp = 0;
-  iter->user_data = NULL;
-
-  return FALSE;
+  if (parent)
+    {
+      iter->stamp = 0;      
+      iter->user_data = NULL;
+      return FALSE;
+    }
+  else
+    {
+      iter->stamp = GTK_LIST_STORE (tree_model)->stamp;
+      iter->user_data = GTK_LIST_STORE (tree_model)->root;
+      return TRUE;
+    }
 }
 
 static gboolean
diff --git a/gtk/gtkmain.c b/gtk/gtkmain.c
index 61e1556580..c66f4922d2 100644
--- a/gtk/gtkmain.c
+++ b/gtk/gtkmain.c
@@ -147,7 +147,8 @@ static const GDebugKey gtk_debug_keys[] = {
   {"signals", GTK_DEBUG_SIGNALS},
   {"dnd", GTK_DEBUG_DND},
   {"plugsocket", GTK_DEBUG_PLUGSOCKET},
-  {"text", GTK_DEBUG_TEXT}
+  {"text", GTK_DEBUG_TEXT},
+  {"tree", GTK_DEBUG_TREE}
 };
 
 static const guint gtk_ndebug_keys = sizeof (gtk_debug_keys) / sizeof (GDebugKey);
diff --git a/gtk/gtkrbtree.c b/gtk/gtkrbtree.c
index 6afc080ecf..0cc35821ef 100644
--- a/gtk/gtkrbtree.c
+++ b/gtk/gtkrbtree.c
@@ -18,6 +18,7 @@
  */
 
 #include "gtkrbtree.h"
+#include "gtkdebug.h"
 
 static void       _gtk_rbnode_validate_allocator (GAllocator *allocator);
 static GtkRBNode *_gtk_rbnode_new                (GtkRBTree  *tree,
@@ -522,6 +523,9 @@ _gtk_rbtree_insert_after (GtkRBTree  *tree,
     }
   _gtk_rbtree_insert_fixup (tree, node);
 
+  if (gtk_debug_flags & GTK_DEBUG_TREE)
+    _gtk_rbtree_test (tree);
+  
   return node;
 }
 
@@ -580,6 +584,9 @@ _gtk_rbtree_insert_before (GtkRBTree  *tree,
     }
   _gtk_rbtree_insert_fixup (tree, node);
 
+  if (gtk_debug_flags & GTK_DEBUG_TREE)
+    _gtk_rbtree_test (tree);
+  
   return node;
 }
 
@@ -765,6 +772,9 @@ _gtk_rbtree_remove_node (GtkRBTree *tree,
   y->left = current_allocator->free_nodes;
   current_allocator->free_nodes = y;
   G_UNLOCK (current_allocator);
+
+  if (gtk_debug_flags & GTK_DEBUG_TREE)
+    _gtk_rbtree_test (tree);
 }
 
 GtkRBNode *
diff --git a/gtk/gtktreedatalist.c b/gtk/gtktreedatalist.c
index 1e9b7f570c..6fdf9d2e9e 100644
--- a/gtk/gtktreedatalist.c
+++ b/gtk/gtktreedatalist.c
@@ -181,12 +181,15 @@ _gtk_tree_data_list_node_to_value (GtkTreeDataList *list,
     case G_TYPE_STRING:
       g_value_set_string (value, (gchar *) list->data.v_pointer);
       break;
-    case G_TYPE_OBJECT:
-      g_value_set_object (value, (GObject *) list->data.v_pointer);
-      break;
+
     default:
-      g_warning ("Unsupported type (%s) retrieved.", g_type_name (value->g_type));
-      return;
+      if (g_type_is_a (type, G_TYPE_OBJECT))
+        g_value_set_object (value, (GObject *) list->data.v_pointer);
+      else if (g_type_is_a (type, G_TYPE_BOXED))
+        g_value_set_boxed (value, (GObject *) list->data.v_pointer);
+      else
+        g_warning ("Unsupported type (%s) retrieved.", g_type_name (value->g_type));
+      break;
     }
 }
 
@@ -220,12 +223,14 @@ _gtk_tree_data_list_value_to_node (GtkTreeDataList *list,
     case G_TYPE_STRING:
       list->data.v_pointer = g_value_dup_string (value);
       break;
-    case G_TYPE_OBJECT:
-      list->data.v_pointer = g_value_dup_object (value);
-      break;
     default:
-      g_warning ("Unsupported type (%s) stored.", g_type_name (value->g_type));
-      return;
+      if (g_type_is_a (G_VALUE_TYPE (value), G_TYPE_OBJECT))
+        list->data.v_pointer = g_value_dup_object (value);
+      else if (g_type_is_a (G_VALUE_TYPE (value), G_TYPE_BOXED))
+        list->data.v_pointer = g_value_dup_boxed (value);
+      else
+        g_warning ("Unsupported type (%s) stored.", g_type_name (value->g_type));
+      break;
     }
 }
 
diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c
index d7c121fa0f..469b9e280c 100644
--- a/gtk/gtktreeview.c
+++ b/gtk/gtktreeview.c
@@ -2275,7 +2275,7 @@ gtk_tree_view_calc_size (GtkTreeView *tree_view,
 			 GtkTreeIter *iter,
 			 gint         depth)
 {
-  GtkRBNode *temp = tree->root;
+  GtkRBNode *temp;
   GtkTreeIter child;
   GtkCellRenderer *cell;
   GList *list;
@@ -2285,6 +2285,7 @@ gtk_tree_view_calc_size (GtkTreeView *tree_view,
 
   TREE_VIEW_INTERNAL_ASSERT_VOID (tree != NULL);
 
+  temp = tree->root;
   while (temp->left != tree->nil)
     temp = temp->left;
 
@@ -2434,7 +2435,8 @@ gtk_tree_view_check_dirty (GtkTreeView *tree_view)
   gboolean dirty = FALSE;
   GList *list;
   GtkTreeViewColumn *column;
-
+  GtkTreeIter iter;
+  
   for (list = tree_view->priv->columns; list; list = list->next)
     {
       column = list->data;
@@ -2451,16 +2453,14 @@ gtk_tree_view_check_dirty (GtkTreeView *tree_view)
     return;
 
   path = gtk_tree_path_new_root ();
-  if (path != NULL)
+  if (gtk_tree_model_get_iter (tree_view->priv->model, &iter, path))
     {
-      GtkTreeIter iter;
-
-      gtk_tree_model_get_iter (tree_view->priv->model, &iter, path);
-      gtk_tree_path_free (path);
       gtk_tree_view_calc_size (tree_view, tree_view->priv->tree, &iter, 1);
       _gtk_tree_view_set_size (tree_view, -1, -1);
     }
-
+      
+  gtk_tree_path_free (path);
+  
   for (list = tree_view->priv->columns; list; list = list->next)
     {
       column = list->data;
@@ -2915,10 +2915,13 @@ gtk_tree_view_setup_model (GtkTreeView *tree_view)
     return;
 
   path = gtk_tree_path_new_root ();
-  gtk_tree_model_get_iter (tree_view->priv->model, &iter, path);
-  gtk_tree_path_free (path);
 
-  gtk_tree_view_build_tree (tree_view, tree_view->priv->tree, &iter, 1, FALSE, GTK_WIDGET_REALIZED (tree_view));
+  if (gtk_tree_model_get_iter (tree_view->priv->model, &iter, path))
+    {
+      gtk_tree_view_build_tree (tree_view, tree_view->priv->tree, &iter, 1, FALSE, GTK_WIDGET_REALIZED (tree_view));
+    }
+  
+  gtk_tree_path_free (path);
 
   gtk_tree_view_create_buttons (tree_view);
 
diff --git a/gtk/gtktreeviewcolumn.c b/gtk/gtktreeviewcolumn.c
index b456d20d07..54d3a85864 100644
--- a/gtk/gtktreeviewcolumn.c
+++ b/gtk/gtktreeviewcolumn.c
@@ -486,7 +486,7 @@ gtk_tree_view_column_get_size (GtkTreeViewColumn *tree_column)
  **/
 void
 gtk_tree_view_column_set_width (GtkTreeViewColumn *tree_column,
-			       gint               size)
+                                gint               size)
 {
   g_return_if_fail (tree_column != NULL);
   g_return_if_fail (GTK_IS_TREE_VIEW_COLUMN (tree_column));
diff --git a/gtk/gtktreeviewcolumn.h b/gtk/gtktreeviewcolumn.h
index f1367caff7..bb5ca44be4 100644
--- a/gtk/gtktreeviewcolumn.h
+++ b/gtk/gtktreeviewcolumn.h
@@ -64,7 +64,7 @@ struct _GtkTreeViewColumn
   gint min_width;
   gint max_width;
 
-  GtkTreeViewColumnFunc *func;
+  GtkTreeViewColumnFunc func;
   gpointer func_data;
   gchar *title;
   GtkCellRenderer *cell;