[glade/internal-child-support] Merge conflict fix

[Juan Pablo Ugarte <jpu src gnome org>]

commit 7f75280b2294aef7643e48eb6f616427f6b6774e
Author: Juan Pablo Ugarte <juanpablougarte gmail com>
Date:   Thu Mar 31 21:12:21 2011 -0300

    Merge conflict fix

 gladeui/glade-widget.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/gladeui/glade-widget.c b/gladeui/glade-widget.c
index dd69f47..fca69eb 100644
--- a/gladeui/glade-widget.c
+++ b/gladeui/glade-widget.c
@@ -1280,7 +1280,7 @@ glade_widget_class_init (GladeWidgetClass * klass)
                          GLADE_CREATE_USER,
                          GLADE_CREATE_REASONS - 1,
                          GLADE_CREATE_USER,
-                         G_PARAM_CONSTRUCT_ONLY | G_PARAM_WRITABLE);
+                         G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE));
 
   properties[PROP_TOPLEVEL_WIDTH] =
        g_param_spec_int ("toplevel-width", _("Toplevel Width"),