aboutsummaryrefslogtreecommitdiffstats
path: root/widgets
diff options
context:
space:
mode:
Diffstat (limited to 'widgets')
-rw-r--r--widgets/table/e-tree-selection-model.c13
-rw-r--r--widgets/table/e-tree.c2
2 files changed, 7 insertions, 8 deletions
diff --git a/widgets/table/e-tree-selection-model.c b/widgets/table/e-tree-selection-model.c
index 6198973395..f35a9563f0 100644
--- a/widgets/table/e-tree-selection-model.c
+++ b/widgets/table/e-tree-selection-model.c
@@ -53,13 +53,6 @@ struct ETreeSelectionModelPriv {
gint cursor_col;
gint selection_start_row;
- guint model_changed_id;
- guint model_row_inserted_id, model_row_deleted_id;
-
- guint frozen : 1;
- guint selection_model_changed : 1;
- guint group_info_changed : 1;
-
int tree_model_pre_change_id;
int tree_model_node_changed_id;
int tree_model_node_data_changed_id;
@@ -956,9 +949,15 @@ e_tree_selection_model_init (ETreeSelectionModel *etsm)
priv = g_new(ETreeSelectionModelPriv, 1);
etsm->priv = priv;
+ priv->etta = NULL;
+ priv->ets = NULL;
+ priv->model = NULL;
+
priv->root = NULL;
+
priv->cursor_path = NULL;
priv->cursor_col = -1;
+ priv->selection_start_row = 0;
priv->tree_model_pre_change_id = 0;
priv->tree_model_node_changed_id = 0;
diff --git a/widgets/table/e-tree.c b/widgets/table/e-tree.c
index bdc1db64ac..fe8576175f 100644
--- a/widgets/table/e-tree.c
+++ b/widgets/table/e-tree.c
@@ -862,7 +862,7 @@ et_real_construct (ETree *e_tree, ETreeModel *etm, ETableExtras *ete,
gtk_object_set (GTK_OBJECT (e_tree->priv->selection),
"sorter", e_tree->priv->sorter,
-#if 0
+#ifdef E_TREE_USE_TREE_SELECTION
"model", e_tree->priv->model,
"ets", e_tree->priv->sorted,
"etta", e_tree->priv->etta,