diff --git a/ChangeLog b/ChangeLog
index a306d32efa..fb47b318cd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-08-17  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkframe.c (gtk_frame_paint): Take widget->state into account when
+	painting the shadows.  (#150351, Tim Janik)
+
 2004-08-17  Matthias Clasen  <mclasen@redhat.com>
 
 	* gtk/abicheck.sh: No need for INCLUDE_INTERNAL_SYMBOLS anymore.
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index a306d32efa..fb47b318cd 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2004-08-17  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkframe.c (gtk_frame_paint): Take widget->state into account when
+	painting the shadows.  (#150351, Tim Janik)
+
 2004-08-17  Matthias Clasen  <mclasen@redhat.com>
 
 	* gtk/abicheck.sh: No need for INCLUDE_INTERNAL_SYMBOLS anymore.
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index a306d32efa..fb47b318cd 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+2004-08-17  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkframe.c (gtk_frame_paint): Take widget->state into account when
+	painting the shadows.  (#150351, Tim Janik)
+
 2004-08-17  Matthias Clasen  <mclasen@redhat.com>
 
 	* gtk/abicheck.sh: No need for INCLUDE_INTERNAL_SYMBOLS anymore.
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index a306d32efa..fb47b318cd 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+2004-08-17  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkframe.c (gtk_frame_paint): Take widget->state into account when
+	painting the shadows.  (#150351, Tim Janik)
+
 2004-08-17  Matthias Clasen  <mclasen@redhat.com>
 
 	* gtk/abicheck.sh: No need for INCLUDE_INTERNAL_SYMBOLS anymore.
diff --git a/gtk/gtkframe.c b/gtk/gtkframe.c
index e0452e415e..a8f40a0955 100644
--- a/gtk/gtkframe.c
+++ b/gtk/gtkframe.c
@@ -566,7 +566,7 @@ gtk_frame_paint (GtkWidget    *widget,
 
 	  
 	  gtk_paint_shadow_gap (widget->style, widget->window,
-				GTK_STATE_NORMAL, frame->shadow_type,
+				widget->state, frame->shadow_type,
 				area, widget, "frame",
 				x, y, width, height,
 				GTK_POS_TOP, 
@@ -574,7 +574,7 @@ gtk_frame_paint (GtkWidget    *widget,
 	}
        else
 	 gtk_paint_shadow (widget->style, widget->window,
-			   GTK_STATE_NORMAL, frame->shadow_type,
+			   widget->state, frame->shadow_type,
 			   area, widget, "frame",
 			   x, y, width, height);
     }