diff --git a/ChangeLog b/ChangeLog
index d2396a42a3..fc9816810f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Sat Nov 28 10:57:59 1998  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/gtkwindow.c (gtk_window_expose_event): Removed bogus
+	expose_event handler - we had two expose_event
+	handlers!
+
 Sat Nov 28 03:13:42 1998  Tim Janik  <timj@gtk.org>
 
 	* gtk/gtkscrolledwindow.h: 
diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index d2396a42a3..fc9816810f 100644
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,9 @@
+Sat Nov 28 10:57:59 1998  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/gtkwindow.c (gtk_window_expose_event): Removed bogus
+	expose_event handler - we had two expose_event
+	handlers!
+
 Sat Nov 28 03:13:42 1998  Tim Janik  <timj@gtk.org>
 
 	* gtk/gtkscrolledwindow.h: 
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index d2396a42a3..fc9816810f 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+Sat Nov 28 10:57:59 1998  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/gtkwindow.c (gtk_window_expose_event): Removed bogus
+	expose_event handler - we had two expose_event
+	handlers!
+
 Sat Nov 28 03:13:42 1998  Tim Janik  <timj@gtk.org>
 
 	* gtk/gtkscrolledwindow.h: 
diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index d2396a42a3..fc9816810f 100644
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,9 @@
+Sat Nov 28 10:57:59 1998  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/gtkwindow.c (gtk_window_expose_event): Removed bogus
+	expose_event handler - we had two expose_event
+	handlers!
+
 Sat Nov 28 03:13:42 1998  Tim Janik  <timj@gtk.org>
 
 	* gtk/gtkscrolledwindow.h: 
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index d2396a42a3..fc9816810f 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,9 @@
+Sat Nov 28 10:57:59 1998  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/gtkwindow.c (gtk_window_expose_event): Removed bogus
+	expose_event handler - we had two expose_event
+	handlers!
+
 Sat Nov 28 03:13:42 1998  Tim Janik  <timj@gtk.org>
 
 	* gtk/gtkscrolledwindow.h: 
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index d2396a42a3..fc9816810f 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,9 @@
+Sat Nov 28 10:57:59 1998  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/gtkwindow.c (gtk_window_expose_event): Removed bogus
+	expose_event handler - we had two expose_event
+	handlers!
+
 Sat Nov 28 03:13:42 1998  Tim Janik  <timj@gtk.org>
 
 	* gtk/gtkscrolledwindow.h: 
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index d2396a42a3..fc9816810f 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+Sat Nov 28 10:57:59 1998  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/gtkwindow.c (gtk_window_expose_event): Removed bogus
+	expose_event handler - we had two expose_event
+	handlers!
+
 Sat Nov 28 03:13:42 1998  Tim Janik  <timj@gtk.org>
 
 	* gtk/gtkscrolledwindow.h: 
diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c
index 6950dc8714..b078b4891d 100644
--- a/gtk/gtkwindow.c
+++ b/gtk/gtkwindow.c
@@ -62,8 +62,6 @@ static void gtk_window_size_request       (GtkWidget         *widget,
 					   GtkRequisition    *requisition);
 static void gtk_window_size_allocate      (GtkWidget         *widget,
 					   GtkAllocation     *allocation);
-static gint gtk_window_expose_event       (GtkWidget         *widget,
-					   GdkEventExpose    *event);
 static gint gtk_window_configure_event    (GtkWidget         *widget,
 					   GdkEventConfigure *event);
 static gint gtk_window_key_press_event    (GtkWidget         *widget,
@@ -171,7 +169,6 @@ gtk_window_class_init (GtkWindowClass *klass)
   widget_class->realize = gtk_window_realize;
   widget_class->size_request = gtk_window_size_request;
   widget_class->size_allocate = gtk_window_size_allocate;
-  widget_class->expose_event = gtk_window_expose_event;
   widget_class->configure_event = gtk_window_configure_event;
   widget_class->key_press_event = gtk_window_key_press_event;
   widget_class->key_release_event = gtk_window_key_release_event;
@@ -732,21 +729,6 @@ gtk_window_size_allocate (GtkWidget     *widget,
     }
 }
 
-static gint
-gtk_window_expose_event (GtkWidget      *widget,
-			 GdkEventExpose *event)
-{
-  g_return_val_if_fail (widget != NULL, FALSE);
-  g_return_val_if_fail (GTK_IS_WINDOW (widget), FALSE);
-  g_return_val_if_fail (event != NULL, FALSE);
-
-  if (GTK_WIDGET_DRAWABLE (widget))
-    if (GTK_WIDGET_CLASS (parent_class)->expose_event)
-      return (* GTK_WIDGET_CLASS (parent_class)->expose_event) (widget, event);
-  
-  return FALSE;
-}
-
 static gint
 gtk_window_configure_event (GtkWidget         *widget,
 			    GdkEventConfigure *event)