aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSrinivasa Ragavan <sragavan@src.gnome.org>2006-08-21 03:41:18 +0800
committerSrinivasa Ragavan <sragavan@src.gnome.org>2006-08-21 03:41:18 +0800
commitf210c6ef1e5425c4c23b34f2e6b81f63c7b68c61 (patch)
tree854c745be51c06a2c0a75321441bca9fcf4a8b39
parent84779196fa3510e4d2fbf53b7a2dfcc1575b39c4 (diff)
downloadgsoc2013-evolution-f210c6ef1e5425c4c23b34f2e6b81f63c7b68c61.tar.gz
gsoc2013-evolution-f210c6ef1e5425c4c23b34f2e6b81f63c7b68c61.tar.zst
gsoc2013-evolution-f210c6ef1e5425c4c23b34f2e6b81f63c7b68c61.zip
Fix for bug 347430
svn path=/trunk/; revision=32603
-rw-r--r--widgets/misc/ChangeLog7
-rw-r--r--widgets/misc/e-cell-date-edit.c1
-rw-r--r--widgets/table/ChangeLog5
-rw-r--r--widgets/table/e-cell-text.c6
4 files changed, 14 insertions, 5 deletions
diff --git a/widgets/misc/ChangeLog b/widgets/misc/ChangeLog
index 67909845de..7809589164 100644
--- a/widgets/misc/ChangeLog
+++ b/widgets/misc/ChangeLog
@@ -1,3 +1,10 @@
+2006-08-21 Srinivasa Ragavan <sragavan@novell.com>
+
+ ** Fix for bug 347430
+
+ * e-cell-date-edit.c: (e_cell_date_edit_update_cell): commit the text
+ on updation of cell.
+
2006-08-20 Srinivasa Ragavan <sragavan@novell.com>
** Patch from Pavel Roskin.
diff --git a/widgets/misc/e-cell-date-edit.c b/widgets/misc/e-cell-date-edit.c
index df28d671ed..8eed38e7f1 100644
--- a/widgets/misc/e-cell-date-edit.c
+++ b/widgets/misc/e-cell-date-edit.c
@@ -887,6 +887,7 @@ e_cell_date_edit_update_cell (ECellDateEdit *ecde,
if (strcmp (old_text, text)) {
e_cell_text_set_value (ecell_text, ecv->e_table_model,
ecol->col_idx, ecp->popup_row, text);
+ e_cell_leave_edit (ecv, ecp->popup_view_col, ecol->col_idx, ecp->popup_row, NULL);
}
e_cell_text_free_text (ecell_text, old_text);
diff --git a/widgets/table/ChangeLog b/widgets/table/ChangeLog
index 68e05cafdd..0cbb297701 100644
--- a/widgets/table/ChangeLog
+++ b/widgets/table/ChangeLog
@@ -1,3 +1,8 @@
+2006-08-21 Srinivasa Ragavan <sragavan@novell.com>
+
+ * e-cell-text.c: (ect_event): Add a null check and remove code for a
+ possible crash which is really useless.
+
2006-08-20 Srinivasa Ragavan <sragavan@novell.com>
** Patch from Pavel Roskin.
diff --git a/widgets/table/e-cell-text.c b/widgets/table/e-cell-text.c
index 0de23751fd..848c96c022 100644
--- a/widgets/table/e-cell-text.c
+++ b/widgets/table/e-cell-text.c
@@ -969,7 +969,7 @@ ect_event (ECellView *ecell_view, GdkEvent *event, int model_col, int view_col,
edit->show_cursor = FALSE;
} else {
- if (edit->im_context) {
+ if (edit && edit->im_context) {
g_signal_handlers_disconnect_matched (
edit->im_context,
G_SIGNAL_MATCH_DATA, 0, 0,
@@ -978,10 +978,6 @@ ect_event (ECellView *ecell_view, GdkEvent *event, int model_col, int view_col,
}
ect_stop_editing (text_view, TRUE);
- if (edit->timeout_id) {
- g_source_remove(edit->timeout_id);
- edit->timeout_id = 0;
- }
}
return_val = TRUE;
/* Fallthrough */