[gtk+/treeview-refactor-staging: 2/16] Fixed merge conflicts from cherry-pick of construct-only GtkTreeViewColumn:cell-area property.

[Tristan Van Berkom <tvb src gnome org>]

commit 0f4a2d322be507aaae8229f84bf80665901512d3
Author: Tristan Van Berkom <tristan van berkom gmail com>
Date:   Sat Dec 4 15:52:40 2010 +0900

    Fixed merge conflicts from cherry-pick of construct-only GtkTreeViewColumn:cell-area property.

 gtk/gtktreeviewcolumn.c |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)
---
diff --git a/gtk/gtktreeviewcolumn.c b/gtk/gtktreeviewcolumn.c
index 30d84ff..effd8a3 100644
--- a/gtk/gtktreeviewcolumn.c
+++ b/gtk/gtktreeviewcolumn.c
@@ -75,7 +75,8 @@ enum
   PROP_REORDERABLE,
   PROP_SORT_INDICATOR,
   PROP_SORT_ORDER,
-  PROP_SORT_COLUMN_ID
+  PROP_SORT_COLUMN_ID,
+  PROP_CELL_AREA
 };
 
 enum
@@ -434,7 +435,7 @@ gtk_tree_view_column_constructor (GType                    type,
   tree_column->cell_area_context = gtk_cell_area_create_context (tree_column->cell_area);
 
   tree_column->context_changed_signal =
-    g_signal_connect (priv->cell_area_context, "notify",
+    g_signal_connect (tree_column->cell_area_context, "notify",
 		      G_CALLBACK (gtk_tree_view_column_context_changed), tree_column);
 
   return object;
@@ -693,7 +694,7 @@ gtk_tree_view_column_get_property (GObject         *object,
       break;
 
     case PROP_CELL_AREA:
-      g_value_set_object (value, tree_column->priv->cell_area);
+      g_value_set_object (value, tree_column->cell_area);
       break;
       
     default: