[gtk+/native-layout] Pulling back some cleanup/changes from the incubator branch

[Tristan Van Berkom <tvb src gnome org>]

commit fd66586b332cdc732fa5adafc856cbd0af2b7b5d
Author: Tristan Van Berkom <tristan van berkom gmail com>
Date:   Fri Aug 6 14:22:59 2010 -0400

    Pulling back some cleanup/changes from the incubator branch

 gtk/gtktreeview.c       |    2 +-
 gtk/gtktreeviewcolumn.h |    5 -----
 2 files changed, 1 insertions(+), 6 deletions(-)
---
diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c
index eb6b62d..80c6680 100644
--- a/gtk/gtktreeview.c
+++ b/gtk/gtktreeview.c
@@ -15827,6 +15827,7 @@ gtk_tree_view_get_tooltip_column (GtkTreeView *tree_view)
   return tree_view->priv->tooltip_column;
 }
 
+
 static void
 gtk_tree_view_get_minimum_size (GtkWidget      *widget,
 				GtkRequisition *requisition)
@@ -15923,4 +15924,3 @@ gtk_tree_view_get_height (GtkSizeRequest *widget,
 {
   gtk_tree_view_get_size (widget, GTK_ORIENTATION_VERTICAL, minimum_size, natural_size);
 }
-
diff --git a/gtk/gtktreeviewcolumn.h b/gtk/gtktreeviewcolumn.h
index b3c171a..9b047eb 100644
--- a/gtk/gtktreeviewcolumn.h
+++ b/gtk/gtktreeviewcolumn.h
@@ -227,11 +227,6 @@ void                    gtk_tree_view_column_cell_get_size       (GtkTreeViewCol
 								  gint                    *width,
 								  gint                    *height);
 
-/* XXX: this ones going away ... */
-void gtk_tree_view_column_get_desired_size (GtkTreeViewColumn *column,
-					    GtkRequisition    *minimal_size,
-					    GtkRequisition    *desired_size);
-
 void                    gtk_tree_view_column_get_natural_width   (GtkTreeViewColumn       *column,
 								  gint                    *minimum_width,
 								  gint                    *natural_width);