diff --git a/ChangeLog b/ChangeLog
index 2ab004a92f..cd9f45aa20 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-10-06  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkcellview.c: Don't set the background of the
+	window in a no-window widget.  (#359581, Xan Lopez)
+
+
 2006-10-05  Behdad Esfahbod  <behdad@gnome.org>
 
 	* gtk/Makefile.am, gtk/aliasfilescheck.sh:  Propagate srcdir into the
diff --git a/gtk/gtkcellview.c b/gtk/gtkcellview.c
index 527a8dfe7a..89a60c348e 100644
--- a/gtk/gtkcellview.c
+++ b/gtk/gtkcellview.c
@@ -67,8 +67,6 @@ static void        gtk_cell_view_set_property             (GObject          *obj
                                                            const GValue     *value,
                                                            GParamSpec       *pspec);
 static void        gtk_cell_view_finalize                 (GObject          *object);
-static void        gtk_cell_view_style_set                (GtkWidget        *widget,
-                                                           GtkStyle         *previous_style);
 static void        gtk_cell_view_size_request             (GtkWidget        *widget,
                                                            GtkRequisition   *requisition);
 static void        gtk_cell_view_size_allocate            (GtkWidget        *widget,
@@ -135,7 +133,6 @@ gtk_cell_view_class_init (GtkCellViewClass *klass)
   widget_class->expose_event = gtk_cell_view_expose;
   widget_class->size_allocate = gtk_cell_view_size_allocate;
   widget_class->size_request = gtk_cell_view_size_request;
-  widget_class->style_set = gtk_cell_view_style_set;
 
   /* properties */
   g_object_class_install_property (gobject_class,
@@ -267,15 +264,6 @@ gtk_cell_view_init (GtkCellView *cellview)
   cellview->priv = GTK_CELL_VIEW_GET_PRIVATE (cellview);
 }
 
-static void
-gtk_cell_view_style_set (GtkWidget *widget,
-                         GtkStyle  *previous_style)
-{
-  if (previous_style && GTK_WIDGET_REALIZED (widget))
-    gdk_window_set_background (widget->window,
-                               &widget->style->base[GTK_WIDGET_STATE (widget)]);
-}
-
 static void
 gtk_cell_view_finalize (GObject *object)
 {