[glade/internal-child-support] Really fix rebase conflicts



commit 6b81a63560cb3b3d5bd9f995cee27a0540bc57e6
Author: Juan Pablo Ugarte <juanpablougarte gmail com>
Date:   Thu Mar 31 21:15:58 2011 -0300

    Really fix rebase conflicts

 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 fca69eb..fcd0b30 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_READWRITE));
+                         G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE);
 
   properties[PROP_TOPLEVEL_WIDTH] =
        g_param_spec_int ("toplevel-width", _("Toplevel Width"),



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]