aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--widgets/table/e-table-item.c17
-rw-r--r--widgets/table/e-tree.c4
2 files changed, 10 insertions, 11 deletions
diff --git a/widgets/table/e-table-item.c b/widgets/table/e-table-item.c
index ab6a65725b..1198de4d2e 100644
--- a/widgets/table/e-table-item.c
+++ b/widgets/table/e-table-item.c
@@ -2810,16 +2810,13 @@ eti_cursor_activated (ESelectionModel *selection, int row, int col, ETableItem *
view_row = model_to_view_row(eti, row);
view_col = model_to_view_col(eti, col);
- if (view_row == -1 || view_col == -1) {
- e_table_item_leave_edit_(eti);
- return;
- }
-
- if (! e_table_model_has_change_pending (eti->table_model)) {
- if (!eti->in_key_press) {
- eti_show_cursor(eti, DOUBLE_CLICK_TIME + 10);
- } else {
- eti_show_cursor(eti, 0);
+ if (view_row != -1 && view_col != -1) {
+ if (! e_table_model_has_change_pending (eti->table_model)) {
+ if (!eti->in_key_press) {
+ eti_show_cursor(eti, DOUBLE_CLICK_TIME + 10);
+ } else {
+ eti_show_cursor(eti, 0);
+ }
}
}
diff --git a/widgets/table/e-tree.c b/widgets/table/e-tree.c
index 754be53e06..89bb65708d 100644
--- a/widgets/table/e-tree.c
+++ b/widgets/table/e-tree.c
@@ -537,10 +537,12 @@ static void
item_cursor_activated (ETableItem *eti, int row, ETree *et)
{
ETreePath path = e_tree_table_adapter_node_at_row(et->priv->etta, row);
- path = e_tree_sorted_view_to_model_path(et->priv->sorted, path);
+ if (path)
+ path = e_tree_sorted_view_to_model_path(et->priv->sorted, path);
gtk_signal_emit (GTK_OBJECT (et),
et_signals [CURSOR_ACTIVATED],
row, path);
+ d(g_print("%s: Emitted CURSOR_ACTIVATED signal on row: %d and path: 0x%p\n", __FUNCTION__, row, path));
}
static void