diff --git a/ChangeLog b/ChangeLog
index 05cb01ade0..4fc9ae73c1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Aug 10 16:55:53 2001  Tim Janik  <timj@gtk.org>
+
+	* gtk/gtkwindow.c (gtk_window_set_policy): coalesce multiple
+	property notifies.
+
 2001-08-07  Havoc Pennington  <hp@pobox.com>
 
 	* gtk/gtkfilesel.c (open_ref_dir): fix a typo.
diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 05cb01ade0..4fc9ae73c1 100644
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,8 @@
+Fri Aug 10 16:55:53 2001  Tim Janik  <timj@gtk.org>
+
+	* gtk/gtkwindow.c (gtk_window_set_policy): coalesce multiple
+	property notifies.
+
 2001-08-07  Havoc Pennington  <hp@pobox.com>
 
 	* gtk/gtkfilesel.c (open_ref_dir): fix a typo.
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 05cb01ade0..4fc9ae73c1 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+Fri Aug 10 16:55:53 2001  Tim Janik  <timj@gtk.org>
+
+	* gtk/gtkwindow.c (gtk_window_set_policy): coalesce multiple
+	property notifies.
+
 2001-08-07  Havoc Pennington  <hp@pobox.com>
 
 	* gtk/gtkfilesel.c (open_ref_dir): fix a typo.
diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 05cb01ade0..4fc9ae73c1 100644
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,8 @@
+Fri Aug 10 16:55:53 2001  Tim Janik  <timj@gtk.org>
+
+	* gtk/gtkwindow.c (gtk_window_set_policy): coalesce multiple
+	property notifies.
+
 2001-08-07  Havoc Pennington  <hp@pobox.com>
 
 	* gtk/gtkfilesel.c (open_ref_dir): fix a typo.
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 05cb01ade0..4fc9ae73c1 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+Fri Aug 10 16:55:53 2001  Tim Janik  <timj@gtk.org>
+
+	* gtk/gtkwindow.c (gtk_window_set_policy): coalesce multiple
+	property notifies.
+
 2001-08-07  Havoc Pennington  <hp@pobox.com>
 
 	* gtk/gtkfilesel.c (open_ref_dir): fix a typo.
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 05cb01ade0..4fc9ae73c1 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+Fri Aug 10 16:55:53 2001  Tim Janik  <timj@gtk.org>
+
+	* gtk/gtkwindow.c (gtk_window_set_policy): coalesce multiple
+	property notifies.
+
 2001-08-07  Havoc Pennington  <hp@pobox.com>
 
 	* gtk/gtkfilesel.c (open_ref_dir): fix a typo.
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 05cb01ade0..4fc9ae73c1 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+Fri Aug 10 16:55:53 2001  Tim Janik  <timj@gtk.org>
+
+	* gtk/gtkwindow.c (gtk_window_set_policy): coalesce multiple
+	property notifies.
+
 2001-08-07  Havoc Pennington  <hp@pobox.com>
 
 	* gtk/gtkfilesel.c (open_ref_dir): fix a typo.
diff --git a/docs/reference/gtk/tmpl/gtkrc.sgml b/docs/reference/gtk/tmpl/gtkrc.sgml
index 30ffca8235..cc0b23b6d2 100644
--- a/docs/reference/gtk/tmpl/gtkrc.sgml
+++ b/docs/reference/gtk/tmpl/gtkrc.sgml
@@ -495,6 +495,7 @@ This can later be composited together with other
 #GtkRcStyle structures to form a #GtkStyle.
 </para>
 
+@parent_instance: 
 @name: 
 @bg_pixmap_name: 
 @font_desc: 
diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c
index e44efd4280..a22fa4b823 100644
--- a/gtk/gtkwindow.c
+++ b/gtk/gtkwindow.c
@@ -964,9 +964,11 @@ gtk_window_set_policy (GtkWindow *window,
   window->allow_shrink = (allow_shrink != FALSE);
   window->allow_grow = (allow_grow != FALSE);
 
+  g_object_freeze_notify (G_OBJECT (window));
   g_object_notify (G_OBJECT (window), "allow_shrink");
   g_object_notify (G_OBJECT (window), "allow_grow");
   g_object_notify (G_OBJECT (window), "resizable");
+  g_object_thaw_notify (G_OBJECT (window));
   
   gtk_widget_queue_resize (GTK_WIDGET (window));
 }