diff --git a/ChangeLog b/ChangeLog
index 9ed2906dcf..ec4ec7fc27 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2002-01-27  Sven Neumann  <sven@gimp.org>
+
+	* gtk/gtkstyle.c (sanitize_size): removed unused return value.
+
 Sat Jan 26 19:27:23 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtksocket.c (gtk_socket_grab_notify): Don't
diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 9ed2906dcf..ec4ec7fc27 100644
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,7 @@
+2002-01-27  Sven Neumann  <sven@gimp.org>
+
+	* gtk/gtkstyle.c (sanitize_size): removed unused return value.
+
 Sat Jan 26 19:27:23 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtksocket.c (gtk_socket_grab_notify): Don't
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 9ed2906dcf..ec4ec7fc27 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,7 @@
+2002-01-27  Sven Neumann  <sven@gimp.org>
+
+	* gtk/gtkstyle.c (sanitize_size): removed unused return value.
+
 Sat Jan 26 19:27:23 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtksocket.c (gtk_socket_grab_notify): Don't
diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 9ed2906dcf..ec4ec7fc27 100644
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,7 @@
+2002-01-27  Sven Neumann  <sven@gimp.org>
+
+	* gtk/gtkstyle.c (sanitize_size): removed unused return value.
+
 Sat Jan 26 19:27:23 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtksocket.c (gtk_socket_grab_notify): Don't
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 9ed2906dcf..ec4ec7fc27 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,7 @@
+2002-01-27  Sven Neumann  <sven@gimp.org>
+
+	* gtk/gtkstyle.c (sanitize_size): removed unused return value.
+
 Sat Jan 26 19:27:23 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtksocket.c (gtk_socket_grab_notify): Don't
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 9ed2906dcf..ec4ec7fc27 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,7 @@
+2002-01-27  Sven Neumann  <sven@gimp.org>
+
+	* gtk/gtkstyle.c (sanitize_size): removed unused return value.
+
 Sat Jan 26 19:27:23 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtksocket.c (gtk_socket_grab_notify): Don't
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 9ed2906dcf..ec4ec7fc27 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,7 @@
+2002-01-27  Sven Neumann  <sven@gimp.org>
+
+	* gtk/gtkstyle.c (sanitize_size): removed unused return value.
+
 Sat Jan 26 19:27:23 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtksocket.c (gtk_socket_grab_notify): Don't
diff --git a/gtk/gtkstyle.c b/gtk/gtkstyle.c
index 0404d78025..47636eb48c 100644
--- a/gtk/gtkstyle.c
+++ b/gtk/gtkstyle.c
@@ -1945,24 +1945,17 @@ gtk_default_render_icon (GtkStyle            *style,
   return stated;
 }
 
-static gboolean
+static void
 sanitize_size (GdkWindow *window,
 	       gint      *width,
 	       gint      *height)
 {
-  gboolean set_bg = FALSE;
-
   if ((*width == -1) && (*height == -1))
-    {
-      set_bg = GDK_IS_WINDOW (window);
-      gdk_window_get_size (window, width, height);
-    }
+    gdk_window_get_size (window, width, height);
   else if (*width == -1)
     gdk_window_get_size (window, width, NULL);
   else if (*height == -1)
     gdk_window_get_size (window, NULL, height);
-
-  return set_bg;
 }
 
 static void