aboutsummaryrefslogtreecommitdiffstats
path: root/widgets/table
diff options
context:
space:
mode:
Diffstat (limited to 'widgets/table')
-rw-r--r--widgets/table/ChangeLog5
-rw-r--r--widgets/table/e-cell-text.c6
2 files changed, 6 insertions, 5 deletions
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 */