X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=gtk%2Fgtkmarshalers.list;h=f952bd1a5afc9bce4dbd0a586bb20dfe9f21b722;hb=3d75f278011b023a93136fe5f52cab97c8fb7215;hp=1c7b4724022f6913bfb3255eeb604a40931b253b;hpb=a7f29c4efc91ef0cc2c585af1d6fbf529bbb0074;p=~andy%2Fgtk

diff --git a/gtk/gtkmarshalers.list b/gtk/gtkmarshalers.list
index 1c7b47240..f952bd1a5 100644
--- a/gtk/gtkmarshalers.list
+++ b/gtk/gtkmarshalers.list
@@ -22,32 +22,58 @@
 #   BOOL        deprecated alias for BOOLEAN
 
 BOOLEAN:BOXED
+BOOLEAN:BOXED,BOXED
+BOOLEAN:ENUM
+BOOLEAN:ENUM,BOOLEAN
+BOOLEAN:ENUM,DOUBLE
+BOOLEAN:ENUM,INT
+BOOLEAN:OBJECT
+BOOLEAN:OBJECT,UINT,FLAGS
 BOOLEAN:OBJECT,INT,INT,UINT
 BOOLEAN:OBJECT,STRING,STRING,BOXED
+BOOLEAN:OBJECT,BOXED
 BOOLEAN:OBJECT,BOXED,BOXED
+BOOLEAN:OBJECT,OBJECT,OBJECT
+BOOLEAN:OBJECT,STRING,STRING
+BOOLEAN:OBJECT,ENUM
+BOOLEAN:INT
+BOOLEAN:INT,INT
+BOOLEAN:INT,INT,INT
+BOOLEAN:INT,INT,BOOLEAN,OBJECT
+BOOLEAN:UINT
 BOOLEAN:VOID
 BOOLEAN:BOOLEAN
+BOOLEAN:NONE
+BOOLEAN:BOOLEAN,BOOLEAN,BOOLEAN
+BOOLEAN:STRING
 ENUM:ENUM
+ENUM:VOID
 INT:POINTER
-NONE:BOOL
+NONE:BOOLEAN
+NONE:ENUM
 NONE:INT
+NONE:INT,BOOL
 NONE:INT,INT
 NONE:NONE
-NONE:POINTER
 NONE:STRING,INT,POINTER
+OBJECT:VOID
+STRING:DOUBLE
+VOID:DOUBLE
 VOID:BOOLEAN
+VOID:BOOLEAN,BOOLEAN,BOOLEAN
 VOID:BOXED
 VOID:BOXED,BOXED
 VOID:BOXED,BOXED,POINTER
-VOID:BOXED,POINTER
 VOID:BOXED,OBJECT
 VOID:BOXED,STRING,INT
 VOID:BOXED,UINT
 VOID:BOXED,UINT,FLAGS
 VOID:BOXED,UINT,UINT
 VOID:ENUM
+VOID:ENUM,BOOLEAN
+VOID:ENUM,ENUM
 VOID:ENUM,FLOAT
-VOID:ENUM,FLOAT,BOOL
+VOID:ENUM,FLOAT,BOOLEAN
 VOID:ENUM,INT
 VOID:ENUM,INT,BOOLEAN
 VOID:INT
@@ -58,17 +84,32 @@ VOID:OBJECT
 VOID:OBJECT,BOOLEAN
 VOID:OBJECT,BOXED,BOXED
 VOID:OBJECT,BOXED,UINT,UINT
+VOID:OBJECT,INT
+VOID:OBJECT,INT,OBJECT
 VOID:OBJECT,INT,INT
 VOID:OBJECT,INT,INT,BOXED,UINT,UINT
 VOID:OBJECT,OBJECT
+VOID:OBJECT,STRING
 VOID:OBJECT,STRING,STRING
 VOID:OBJECT,UINT
+VOID:OBJECT,UINT,FLAGS
+VOID:OBJECT,STRING
 VOID:POINTER
 VOID:POINTER,INT
+VOID:POINTER,BOOLEAN
+VOID:POINTER,POINTER,BOOLEAN
 VOID:POINTER,POINTER,POINTER
 VOID:POINTER,UINT
 VOID:STRING
+VOID:STRING,BOXED
+VOID:STRING,STRING
 VOID:STRING,INT,POINTER
-VOID:UINT,BOXED,UINT,FLAGS,FLAGS
+VOID:STRING,UINT,FLAGS
+VOID:STRING,UINT,FLAGS,UINT
+VOID:UINT,FLAGS,BOXED
+VOID:UINT,UINT
 VOID:UINT,STRING
+VOID:UINT,BOXED,UINT,FLAGS,FLAGS
+VOID:UINT,OBJECT,UINT,FLAGS,FLAGS
 VOID:VOID
+OBJECT:OBJECT,INT,INT