[glade] GladeBaseEditor: fixed bug #773997 "GLADE 3.20: crash on changing ToolItem type"



commit b696f16aceec7562d653510eaf0670c135ad8a5e
Author: Juan Pablo Ugarte <juanpablougarte gmail com>
Date:   Sun Dec 25 14:15:14 2016 -0300

    GladeBaseEditor: fixed bug #773997 "GLADE 3.20: crash on changing ToolItem type"
    
    Do not use a custom marshaller for signals with a GType param.

 gladeui/glade-base-editor.c    |    5 ++---
 gladeui/glade-marshallers.list |    1 -
 2 files changed, 2 insertions(+), 4 deletions(-)
---
diff --git a/gladeui/glade-base-editor.c b/gladeui/glade-base-editor.c
index f3e760d..28ac311 100644
--- a/gladeui/glade-base-editor.c
+++ b/gladeui/glade-base-editor.c
@@ -1538,9 +1538,8 @@ glade_base_editor_class_init (GladeBaseEditorClass *klass)
                     G_TYPE_FROM_CLASS (object_class),
                     G_SIGNAL_RUN_LAST,
                     G_STRUCT_OFFSET (GladeBaseEditorClass, change_type),
-                    _glade_boolean_handled_accumulator, NULL,
-                    _glade_marshal_BOOLEAN__OBJECT_UINT,
-                    G_TYPE_BOOLEAN, 2, G_TYPE_OBJECT, G_TYPE_UINT);
+                    _glade_boolean_handled_accumulator, NULL, NULL,
+                    G_TYPE_BOOLEAN, 2, G_TYPE_OBJECT, G_TYPE_GTYPE);
 
   /**
    * GladeBaseEditor::get-display-name:
diff --git a/gladeui/glade-marshallers.list b/gladeui/glade-marshallers.list
index a720af2..2891325 100644
--- a/gladeui/glade-marshallers.list
+++ b/gladeui/glade-marshallers.list
@@ -15,7 +15,6 @@ BOOLEAN:OBJECT
 BOOLEAN:OBJECT,BOXED
 BOOLEAN:OBJECT,POINTER
 BOOLEAN:OBJECT,BOOLEAN
-BOOLEAN:OBJECT,UINT
 BOOLEAN:OBJECT,OBJECT
 BOOLEAN:OBJECT,STRING
 BOOLEAN:STRING,STRING,STRING,BOXED


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