Fixed a bug in set_property() (setting "window-placement-set" could result

	* gtk/gtkscrolledwindow.c: Fixed a bug in set_property()
	(setting "window-placement-set" could result in a crash because
	of boolean/enum mixup)

diff --git a/ChangeLog b/ChangeLog
index 4da46f94cc0fa1a6671b1f84b8380f7ecc72f50d..a3a76d7e44da6769f47d0f249aa278eaa9be7c4c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2006-12-16  Tristan Van Berkom <tvb@gnome.org>
+
+       * gtk/gtkmessagedialog.c: Added return_if_fail (image) to
+       gtk_message_dialog_set_image ()
+
+       * 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>
 
        Merged from gtk-2-10:

diff --git a/gtk/gtkscrolledwindow.c b/gtk/gtkscrolledwindow.c
index 6ef783a36129eb03824a0020276b82b9ed29634e..d9ab546ef031d7dcfef6e2f23344a71232b464c1 100644 (file)
--- 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: