[gtk+/gtk-2-24] Fixed bug #576492 "GtkBuilder does not respect G_PARAM_CONSTRUCT properties"



commit 2e9e163bbfb39e1c89ce395b11351aba026e0c1c
Author: Juan Pablo Ugarte <juanpablougarte gmail com>
Date:   Fri Jun 3 14:38:59 2011 -0300

    Fixed bug #576492 "GtkBuilder does not respect G_PARAM_CONSTRUCT properties"
    
    Added G_PARAM_CONSTRUCT flag in gtk_builder_get_parameters() checks as suggested by Johan Dahlin.

 gtk/gtkbuilder.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/gtk/gtkbuilder.c b/gtk/gtkbuilder.c
index a8b4526..a1ba56c 100644
--- a/gtk/gtkbuilder.c
+++ b/gtk/gtkbuilder.c
@@ -280,7 +280,7 @@ gtk_builder_get_parameters (GtkBuilder  *builder,
       if (G_IS_PARAM_SPEC_OBJECT (pspec) &&
           (G_PARAM_SPEC_VALUE_TYPE (pspec) != GDK_TYPE_PIXBUF))
         {
-          if (pspec->flags & G_PARAM_CONSTRUCT_ONLY)
+          if (pspec->flags & (G_PARAM_CONSTRUCT | G_PARAM_CONSTRUCT_ONLY))
             {
               GObject *object;
               object = gtk_builder_get_object (builder, prop->data);
@@ -317,7 +317,7 @@ gtk_builder_get_parameters (GtkBuilder  *builder,
           continue;
         }
 
-      if (pspec->flags & G_PARAM_CONSTRUCT_ONLY)
+      if (pspec->flags & (G_PARAM_CONSTRUCT | G_PARAM_CONSTRUCT_ONLY))
         g_array_append_val (*construct_parameters, parameter);
       else
         g_array_append_val (*parameters, parameter);



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