diff options
| author | Tristan Van Berkom <tristan.van.berkom@gmail.com> | 2010-12-04 15:52:40 +0900 |
|---|---|---|
| committer | Tristan Van Berkom <tristan.van.berkom@gmail.com> | 2010-12-04 15:52:40 +0900 |
| commit | 0f4a2d322be507aaae8229f84bf80665901512d3 (patch) | |
| tree | 5f8a5839fe150c70529ee6181615afd185aee55e /gtk/gtktreeviewcolumn.c | |
| parent | acc4dd291287b6217fdee5b0e56e18bfb3899322 (diff) | |
| download | gtk+-0f4a2d322be507aaae8229f84bf80665901512d3.tar.gz | |
Fixed merge conflicts from cherry-pick of construct-only GtkTreeViewColumn:cell-area property.
Diffstat (limited to 'gtk/gtktreeviewcolumn.c')
| -rw-r--r-- | gtk/gtktreeviewcolumn.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/gtk/gtktreeviewcolumn.c b/gtk/gtktreeviewcolumn.c index 30d84ffd3a..effd8a362b 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: |