X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;ds=inline;f=gtk%2Fgtkmarshalers.list;h=14d05190235d8c5447b6cc5449c05a4ef88f431d;hb=cf216d780cb2c889a3bcb5faa825fc1b21af8896;hp=909da41df54b8228b382430ac3a4ea1d5173480c;hpb=29985af0fa06d7db2de812dcc8e0653bd70b1936;p=~andy%2Fgtk

diff --git a/gtk/gtkmarshalers.list b/gtk/gtkmarshalers.list
index 909da41df..14d051902 100644
--- a/gtk/gtkmarshalers.list
+++ b/gtk/gtkmarshalers.list
@@ -22,36 +22,59 @@
 #   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:BOOLEAN,BOOLEAN,BOOLEAN
+BOOLEAN:STRING
 ENUM:ENUM
+ENUM:VOID
 INT:POINTER
-NONE:BOOL
-NONE:INT
-NONE:INT,INT
-NONE:NONE
-NONE:POINTER
-NONE:STRING,INT,POINTER
+OBJECT:VOID
+STRING:DOUBLE
+STRING:STRING
+VOID:DOUBLE
 VOID:BOOLEAN
+VOID:BOOLEAN,BOOLEAN,BOOLEAN
 VOID:BOXED
 VOID:BOXED,BOXED
-VOID:BOXED,BOXED,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:ENUM,INT,INT
+VOID:ENUM,BOXED
+VOID:ENUM,STRING
+VOID:FLAGS
 VOID:INT
+VOID:INT,BOOLEAN
 VOID:INT,INT
 VOID:INT,INT,BOXED
 VOID:INT,INT,INT
@@ -59,17 +82,41 @@ VOID:OBJECT
 VOID:OBJECT,BOOLEAN
 VOID:OBJECT,BOXED,BOXED
 VOID:OBJECT,BOXED,UINT,UINT
+VOID:OBJECT,BOXED,BOOLEAN,BOOLEAN
+VOID:OBJECT,INT
+VOID:OBJECT,INT,OBJECT
 VOID:OBJECT,INT,INT
 VOID:OBJECT,INT,INT,BOXED,UINT,UINT
 VOID:OBJECT,OBJECT
+VOID:OBJECT,POINTER
+VOID:OBJECT,STRING
 VOID:OBJECT,STRING,STRING
 VOID:OBJECT,UINT
+VOID:OBJECT,UINT,FLAGS
+VOID:OBJECT,STRING
+VOID:OBJECT,OBJECT,STRING
+VOID:OBJECT,OBJECT,OBJECT
+VOID:OBJECT,OBJECT,BOXED,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,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:UINT,STRING,UINT
+VOID:UINT,UINT
 VOID:VOID
+OBJECT:OBJECT,INT,INT
+VOID:POINTER,POINTER,POINTER,POINTER,STRING