[gtk+/treeview-refactor-staging: 16/16] Fixed conflicts from rebasing GtkTreeViewColumn changes from treeview-refactor.

[Tristan Van Berkom <tvb src gnome org>]

commit f6c856575e70ea44d55e398d1c5cb18c91fa28ed
Author: Tristan Van Berkom <tristan van berkom gmail com>
Date:   Sat Dec 4 16:24:31 2010 +0900

    Fixed conflicts from rebasing GtkTreeViewColumn changes from treeview-refactor.

 gtk/gtktreeviewcolumn.c |   12 ++++--------
 1 files changed, 4 insertions(+), 8 deletions(-)
---
diff --git a/gtk/gtktreeviewcolumn.c b/gtk/gtktreeviewcolumn.c
index e0e02af..7454a26 100644
--- a/gtk/gtktreeviewcolumn.c
+++ b/gtk/gtktreeviewcolumn.c
@@ -2691,16 +2691,12 @@ gtk_tree_view_column_cell_get_size (GtkTreeViewColumn  *tree_column,
 				    gint               *height)
 {
   GtkTreeViewColumnPrivate *priv;
+  gint min_width = 0, min_height = 0;
 
   g_return_if_fail (GTK_IS_TREE_VIEW_COLUMN (tree_column));
 
   priv = tree_column->priv;
 
-  if (height)
-    * height = 0;
-  if (width)
-    * width = 0;
-
   g_signal_handler_block (priv->cell_area_context, 
 			  priv->context_changed_signal);
 
@@ -2709,13 +2705,13 @@ gtk_tree_view_column_cell_get_size (GtkTreeViewColumn  *tree_column,
                                      priv->tree_view,
                                      NULL, NULL);
 
-  gtk_cell_area_context_get_preferred_width (priv->cell_area_context, width, NULL);
+  gtk_cell_area_context_get_preferred_width (priv->cell_area_context, &min_width, NULL);
 
   gtk_cell_area_get_preferred_height_for_width (priv->cell_area,
                                                 priv->cell_area_context,
                                                 priv->tree_view,
-                                                *width,
-                                                height,
+                                                min_width,
+                                                &min_height,
                                                 NULL);
 
   g_signal_handler_unblock (priv->cell_area_context,