Copy and paste error.

2000-06-01  Christopher James Lahey  <clahey@helixcode.com>

	* e-table.c: Copy and paste error.

	* e-table-item.c: Mixed up parity on eti->editing.

svn path=/trunk/; revision=3368

5 files changed, 14 insertions, 22 deletions

diff --git a/widgets/e-table/ChangeLog b/widgets/e-table/ChangeLog
index 7fe58859f5..58bc7cdaf6 100644
--- a/widgets/e-table/ChangeLog
+++ b/widgets/e-table/ChangeLog
@@ -1,5 +1,11 @@
 2000-06-01  Christopher James Lahey  <clahey@helixcode.com>
 
+	* e-table.c: Copy and paste error.
+
+	* e-table-item.c: Mixed up parity on eti->editing.
+
+2000-06-01  Christopher James Lahey  <clahey@helixcode.com>
+
 	* e-table-group-container.c, e-table-group-leaf.c,
 	e-table-group.c, e-table-group.h, e-table-item.c, e-table-item.h,
 	e-table.c, e-table.h: Added a "key_press" signal.
diff --git a/widgets/e-table/e-table-item.c b/widgets/e-table/e-table-item.c
index 592e69a4d3..8d96543eed 100644
--- a/widgets/e-table/e-table-item.c
+++ b/widgets/e-table/e-table-item.c
@@ -1321,20 +1321,13 @@ eti_event (GnomeCanvasItem *item, GdkEvent *e)
 			
 		default:
 			if (!eti_editing (eti)){
-				if ((e->key.state & (GDK_MOD1_MASK | GDK_CONTROL_MASK)) != 0)
-					return_val = FALSE;
-
-				if (!(e->key.keyval >= 0x20 && e->key.keyval <= 0xff))
-					return_val = FALSE;
+				gtk_signal_emit (GTK_OBJECT (eti), eti_signals [KEY_PRESS],
+						 eti->cursor_row, eti->cursor_col, e, &return_val);
+			} else {
 				ecol = e_table_header_get_column (eti->header, eti->cursor_col);
 				ecell_view = eti->cell_views [eti->cursor_col];
 				e_cell_event (ecell_view, e, ecol->col_idx, eti->cursor_col, eti->cursor_row);
-
-			} else {
-				gtk_signal_emit (GTK_OBJECT (eti), eti_signals [KEY_PRESS],
-						 eti->cursor_row, eti->cursor_col, e, &return_val);
 			}
-
 		}
 		break;
 		
diff --git a/widgets/e-table/e-table.c b/widgets/e-table/e-table.c
index f6ad92e4c2..4cf863f552 100644
--- a/widgets/e-table/e-table.c
+++ b/widgets/e-table/e-table.c
@@ -770,7 +770,7 @@ e_table_class_init (GtkObjectClass *object_class)
 				gtk_marshal_NONE__INT,
 				GTK_TYPE_NONE, 1, GTK_TYPE_INT);
 
-	et_signals [DOUBLE_CLICK] =
+	et_signals [KEY_PRESS] =
 		gtk_signal_new ("key_press",
 				GTK_RUN_LAST,
 				object_class->type,
diff --git a/widgets/table/e-table-item.c b/widgets/table/e-table-item.c
index 592e69a4d3..8d96543eed 100644
--- a/widgets/table/e-table-item.c
+++ b/widgets/table/e-table-item.c
@@ -1321,20 +1321,13 @@ eti_event (GnomeCanvasItem *item, GdkEvent *e)
 			
 		default:
 			if (!eti_editing (eti)){
-				if ((e->key.state & (GDK_MOD1_MASK | GDK_CONTROL_MASK)) != 0)
-					return_val = FALSE;
-
-				if (!(e->key.keyval >= 0x20 && e->key.keyval <= 0xff))
-					return_val = FALSE;
+				gtk_signal_emit (GTK_OBJECT (eti), eti_signals [KEY_PRESS],
+						 eti->cursor_row, eti->cursor_col, e, &return_val);
+			} else {
 				ecol = e_table_header_get_column (eti->header, eti->cursor_col);
 				ecell_view = eti->cell_views [eti->cursor_col];
 				e_cell_event (ecell_view, e, ecol->col_idx, eti->cursor_col, eti->cursor_row);
-
-			} else {
-				gtk_signal_emit (GTK_OBJECT (eti), eti_signals [KEY_PRESS],
-						 eti->cursor_row, eti->cursor_col, e, &return_val);
 			}
-
 		}
 		break;
 		
diff --git a/widgets/table/e-table.c b/widgets/table/e-table.c
index f6ad92e4c2..4cf863f552 100644
--- a/widgets/table/e-table.c
+++ b/widgets/table/e-table.c
@@ -770,7 +770,7 @@ e_table_class_init (GtkObjectClass *object_class)
 				gtk_marshal_NONE__INT,
 				GTK_TYPE_NONE, 1, GTK_TYPE_INT);
 
-	et_signals [DOUBLE_CLICK] =
+	et_signals [KEY_PRESS] =
 		gtk_signal_new ("key_press",
 				GTK_RUN_LAST,
 				object_class->type,