diff --git a/ChangeLog b/ChangeLog
index 270cf8f493..acb37e2daa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,16 @@
-2004-01-10  Derek Atkins  <derek@ihtfp.com>
+2005-01-22  Derek Atkins  <derek@ihtfp.com>
+
+	Stephen Evanchik's patch to convert GncItemEdit to GObject/GLib
+	and fix signal processing:
+
+        * src/register/register-gnome/gnucash-item-edit.h:
+          Made the gnc_item_edit_get_type function return GType
+        * src/register/register-gnome/gnucash-item-edit.h:
+          Made the gnc_item_edit_get_type function use GObject
+        * src/register/register-gnome/gnucash-item-list.c:
+          Removed an extra button_press_event handler
+
+2005-01-10  Derek Atkins  <derek@ihtfp.com>
 
 	Stephen Evanchik's Move GNCDateFormat to GLib patch:
         * src/gnome-utils/gnc-date-format.h:
@@ -11,7 +23,7 @@
                 gnc_date_format_class_init
           Created gnc_date_format_dipose function
 
-2004-01-02  Derek Atkins  <derek@ihtfp.com>
+2005-01-02  Derek Atkins  <derek@ihtfp.com>
 
 	* src/engine/test/Makefile.am: don't explicitly add -lglib.
 
diff --git a/src/register/register-gnome/gnucash-item-edit.c b/src/register/register-gnome/gnucash-item-edit.c
index 000c76b163..af53b0db00 100644
--- a/src/register/register-gnome/gnucash-item-edit.c
+++ b/src/register/register-gnome/gnucash-item-edit.c
@@ -1194,26 +1194,29 @@ gnc_item_edit_class_init (GncItemEditClass *gnc_item_edit_class)
 }
 
 
-GtkType
+GType
 gnc_item_edit_get_type (void)
 {
-        static GtkType gnc_item_edit_type = 0;
+        static GType gnc_item_edit_type = 0;
 
         if (!gnc_item_edit_type) {
-                GtkTypeInfo gnc_item_edit_info = {
-                        "GncItemEdit",
-                        sizeof (GncItemEdit),
+                static const GTypeInfo gnc_item_edit_info = {
                         sizeof (GncItemEditClass),
-                        (GtkClassInitFunc) gnc_item_edit_class_init,
-                        (GtkObjectInitFunc) gnc_item_edit_init,
-                        NULL, /* reserved_1 */
-                        NULL, /* reserved_2 */
-                        (GtkClassInitFunc) NULL
+                        NULL,
+                        NULL,
+                        (GClassInitFunc) gnc_item_edit_class_init,
+                        NULL,
+                        NULL,
+                        sizeof (GncItemEdit),
+			0, /* n_preallocs */
+                        (GInstanceInitFunc) gnc_item_edit_init,
+                        NULL,
                 };
 
                 gnc_item_edit_type =
-			gtk_type_unique(gnome_canvas_item_get_type (),
-					&gnc_item_edit_info);
+			g_type_register_static(gnome_canvas_item_get_type (),
+					"GncItemEdit",
+					&gnc_item_edit_info, 0);
         }
 
         return gnc_item_edit_type;
diff --git a/src/register/register-gnome/gnucash-item-edit.h b/src/register/register-gnome/gnucash-item-edit.h
index 87061f8e2d..ea731e31c3 100644
--- a/src/register/register-gnome/gnucash-item-edit.h
+++ b/src/register/register-gnome/gnucash-item-edit.h
@@ -115,7 +115,7 @@ typedef struct {
 } GncItemEditClass;
 
 
-GtkType gnc_item_edit_get_type (void);
+GType gnc_item_edit_get_type (void);
 
 void gnc_item_edit_configure (GncItemEdit *item_edit);
 
diff --git a/src/register/register-gnome/gnucash-item-list.c b/src/register/register-gnome/gnucash-item-list.c
index c98145bdf8..f478f38aaf 100644
--- a/src/register/register-gnome/gnucash-item-list.c
+++ b/src/register/register-gnome/gnucash-item-list.c
@@ -377,9 +377,6 @@ gnc_item_list_new(GnomeCanvasGroup *parent)
 	g_signal_connect_after (G_OBJECT(frame), "button_press_event",
 				G_CALLBACK (gnc_item_list_button_event), item_list);
 
-	g_signal_connect (G_OBJECT (tree_view), "button_press_event",
-			  G_CALLBACK (gnc_item_list_key_event), item_list);
-
 	g_signal_connect (G_OBJECT (tree_view), "key_press_event",
 			  G_CALLBACK (gnc_item_list_key_event), item_list);