[glade/glade-3-16] GladeBaseEditor->build_child() use correct type for paramenters Fixes bug 704600 "Cannot add items t



commit b0d9df7ee7988e4daec932d41c9da30ea0da5b4f
Author: Juan Pablo Ugarte <juanpablougarte gmail com>
Date:   Sat May 17 20:12:15 2014 -0300

    GladeBaseEditor->build_child() use correct type for paramenters
    Fixes bug 704600 "Cannot add items to menu hierarchy - assertion `GLADE_IS_WIDGET_ADAPTOR (adaptor)' 
failed"
    
      GladeWidget * (*build_child)      (GladeBaseEditor *, GladeWidget *, GType);
    
    glin-genmarshal does not have a specific type for GType thus back in the day UINT was used instead.
    But this is not correct in systems where GType is bigger than UINT

 gladeui/glade-base-editor.c |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)
---
diff --git a/gladeui/glade-base-editor.c b/gladeui/glade-base-editor.c
index 20179cf..339ed34 100644
--- a/gladeui/glade-base-editor.c
+++ b/gladeui/glade-base-editor.c
@@ -1570,9 +1570,8 @@ glade_base_editor_class_init (GladeBaseEditorClass *klass)
                     G_TYPE_FROM_CLASS (object_class),
                     G_SIGNAL_RUN_LAST,
                     G_STRUCT_OFFSET (GladeBaseEditorClass, build_child),
-                    _glade_stop_emission_accumulator, NULL,
-                    _glade_marshal_OBJECT__OBJECT_UINT,
-                    G_TYPE_OBJECT, 2, G_TYPE_OBJECT, G_TYPE_UINT);
+                    _glade_stop_emission_accumulator, NULL, NULL,
+                    G_TYPE_OBJECT, 2, G_TYPE_OBJECT, G_TYPE_GTYPE);
 
   /**
    * GladeBaseEditor::delete-child:


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