diff --git a/ChangeLog b/ChangeLog
index 11a4b81b16..63e103b76d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Wed Jan  5 11:42:49 2005  Søren Sandmann  <sandmann@redhat.com>
+
+	* gtk/gtkviewport.c (gtk_viewport_realize):
+	* gtk/gtktextview.c ((text_window_realize): Set the background of
+	the windows to None instead of adding EXPOSURE_MASK, as suggested
+	by Owen in #162112.
+
 2005-01-05  Matthias Clasen  <mclasen@redhat.com>
 
 	* gdk/x11/gdkevents-x11.c (gdk_wm_protocols_filter): Update 
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 11a4b81b16..63e103b76d 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,10 @@
+Wed Jan  5 11:42:49 2005  Søren Sandmann  <sandmann@redhat.com>
+
+	* gtk/gtkviewport.c (gtk_viewport_realize):
+	* gtk/gtktextview.c ((text_window_realize): Set the background of
+	the windows to None instead of adding EXPOSURE_MASK, as suggested
+	by Owen in #162112.
+
 2005-01-05  Matthias Clasen  <mclasen@redhat.com>
 
 	* gdk/x11/gdkevents-x11.c (gdk_wm_protocols_filter): Update 
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 11a4b81b16..63e103b76d 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,10 @@
+Wed Jan  5 11:42:49 2005  Søren Sandmann  <sandmann@redhat.com>
+
+	* gtk/gtkviewport.c (gtk_viewport_realize):
+	* gtk/gtktextview.c ((text_window_realize): Set the background of
+	the windows to None instead of adding EXPOSURE_MASK, as suggested
+	by Owen in #162112.
+
 2005-01-05  Matthias Clasen  <mclasen@redhat.com>
 
 	* gdk/x11/gdkevents-x11.c (gdk_wm_protocols_filter): Update 
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 11a4b81b16..63e103b76d 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,10 @@
+Wed Jan  5 11:42:49 2005  Søren Sandmann  <sandmann@redhat.com>
+
+	* gtk/gtkviewport.c (gtk_viewport_realize):
+	* gtk/gtktextview.c ((text_window_realize): Set the background of
+	the windows to None instead of adding EXPOSURE_MASK, as suggested
+	by Owen in #162112.
+
 2005-01-05  Matthias Clasen  <mclasen@redhat.com>
 
 	* gdk/x11/gdkevents-x11.c (gdk_wm_protocols_filter): Update 
diff --git a/gtk/gtktextview.c b/gtk/gtktextview.c
index 9345b75173..04f8b26c58 100644
--- a/gtk/gtktextview.c
+++ b/gtk/gtktextview.c
@@ -7174,7 +7174,7 @@ text_window_realize (GtkTextWindow *win,
   attributes.wclass = GDK_INPUT_OUTPUT;
   attributes.visual = gtk_widget_get_visual (win->widget);
   attributes.colormap = gtk_widget_get_colormap (win->widget);
-  attributes.event_mask = GDK_VISIBILITY_NOTIFY_MASK | GDK_EXPOSURE_MASK;
+  attributes.event_mask = GDK_VISIBILITY_NOTIFY_MASK;
 
   attributes_mask = GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL | GDK_WA_COLORMAP;
 
@@ -7182,6 +7182,8 @@ text_window_realize (GtkTextWindow *win,
                                 &attributes,
                                 attributes_mask);
 
+  gdk_window_set_back_pixmap (win->window, NULL, FALSE);
+  
   gdk_window_show (win->window);
   gdk_window_set_user_data (win->window, win->widget);
 
diff --git a/gtk/gtkviewport.c b/gtk/gtkviewport.c
index a5c0a232b6..7026834b6f 100644
--- a/gtk/gtkviewport.c
+++ b/gtk/gtkviewport.c
@@ -621,11 +621,13 @@ gtk_viewport_realize (GtkWidget *widget)
   attributes.y = view_allocation.y;
   attributes.width = view_allocation.width;
   attributes.height = view_allocation.height;
-  attributes.event_mask = GDK_EXPOSURE_MASK;
+  attributes.event_mask = 0;
 
   viewport->view_window = gdk_window_new (widget->window, &attributes, attributes_mask);
   gdk_window_set_user_data (viewport->view_window, viewport);
 
+  gdk_window_set_back_pixmap (viewport->view_window, NULL, FALSE);
+  
   attributes.x = - hadjustment->value;
   attributes.y = - vadjustment->value;
   attributes.width = hadjustment->upper;