aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--addressbook/ChangeLog6
-rw-r--r--addressbook/gui/widgets/e-addressbook-view.c27
2 files changed, 6 insertions, 27 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index 147da44166..9cce046894 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,3 +1,9 @@
+2001-10-24 Christopher James Lahey <clahey@ximian.com>
+
+ * gui/widgets/e-addressbook-view.c
+ (e_addressbook_view_class_init): Removed key_press handler here
+ since delete and backspace are now handled by keybindings.
+
2001-10-23 Jon Trowbridge <trow@ximian.com>
* gui/component/addressbook.c: Fix command paths when we specify
diff --git a/addressbook/gui/widgets/e-addressbook-view.c b/addressbook/gui/widgets/e-addressbook-view.c
index 76f37b5f00..4fca71d0a6 100644
--- a/addressbook/gui/widgets/e-addressbook-view.c
+++ b/addressbook/gui/widgets/e-addressbook-view.c
@@ -68,8 +68,6 @@ static void e_addressbook_view_class_init (EAddressbookViewClass *klass);
static void e_addressbook_view_set_arg (GtkObject *o, GtkArg *arg, guint arg_id);
static void e_addressbook_view_get_arg (GtkObject *object, GtkArg *arg, guint arg_id);
static void e_addressbook_view_destroy (GtkObject *object);
-static gint e_addressbook_view_key_press_event (GtkWidget *widget,
- GdkEventKey *event);
static void change_view_type (EAddressbookView *view, EAddressbookViewType view_type);
static void status_message (GtkObject *object, const gchar *status, EAddressbookView *eav);
@@ -155,8 +153,6 @@ e_addressbook_view_class_init (EAddressbookViewClass *klass)
object_class->get_arg = e_addressbook_view_get_arg;
object_class->destroy = e_addressbook_view_destroy;
- widget_class->key_press_event = e_addressbook_view_key_press_event;
-
gtk_object_add_arg_type ("EAddressbookView::book", GTK_TYPE_OBJECT,
GTK_ARG_READWRITE, ARG_BOOK);
gtk_object_add_arg_type ("EAddressbookView::query", GTK_TYPE_STRING,
@@ -295,29 +291,6 @@ e_addressbook_view_destroy (GtkObject *object)
GTK_OBJECT_CLASS(parent_class)->destroy(object);
}
-static gint
-e_addressbook_view_key_press_event (GtkWidget *widget,
- GdkEventKey *event)
-{
- EAddressbookView *view = E_ADDRESSBOOK_VIEW (widget);
- guint return_val = 0;
-
- if (GTK_WIDGET_CLASS (parent_class)->key_press_event) {
- return_val = GTK_WIDGET_CLASS (parent_class)->key_press_event (widget, event);
- if (return_val != 0)
- return return_val;
- }
-
- if ((event->keyval == GDK_Delete ||
- event->keyval == GDK_KP_Delete) &&
- event->state == 0) {
- e_addressbook_view_delete_selection(view);
- return_val = TRUE;
- }
-
- return return_val;
-}
-
GtkWidget*
e_addressbook_view_new (void)
{