diff --git a/ChangeLog b/ChangeLog
index 0390eb9443..8511c30186 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-12-16  Tristan Van Berkom <tvb@gnome.org>
+
+	* gtk/gtkscrolledwindow.c: Fixed a bug in set_property()
+	(setting "window-placement-set" could result in a crash because
+	of boolean/enum mixup)
+
 2006-12-15  Federico Mena Quintero  <federico@novell.com>
 
 	* gtk/gtkmenu.c (gtk_menu_set_title): Don't try to optimize for
diff --git a/gtk/gtkscrolledwindow.c b/gtk/gtkscrolledwindow.c
index a1b59b8e19..f333604116 100644
--- a/gtk/gtkscrolledwindow.c
+++ b/gtk/gtkscrolledwindow.c
@@ -825,7 +825,7 @@ gtk_scrolled_window_set_property (GObject      *object,
       break;
     case PROP_WINDOW_PLACEMENT_SET:
       gtk_scrolled_window_set_placement_set (scrolled_window,
-		      			     g_value_get_enum (value),
+		      			     g_value_get_boolean (value),
 					     TRUE);
       break;
     case PROP_SHADOW_TYPE: