X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=gtk%2Fgtkmarshalers.list;h=14d05190235d8c5447b6cc5449c05a4ef88f431d;hb=cf216d780cb2c889a3bcb5faa825fc1b21af8896;hp=fe94981656ceb14fdcdbf597012cd9eb8a0e8c7d;hpb=774de16743f776439d756f92fc3ee3cf75a6ca76;p=~andy%2Fgtk

diff --git a/gtk/gtkmarshalers.list b/gtk/gtkmarshalers.list
index fe9498165..14d051902 100644
--- a/gtk/gtkmarshalers.list
+++ b/gtk/gtkmarshalers.list
@@ -21,101 +21,102 @@
 #   NONE        deprecated alias for VOID
 #   BOOL        deprecated alias for BOOLEAN
 
-BOOLEAN:POINTER
-BOOLEAN:POINTER,POINTER
-BOOLEAN:POINTER,INT,INT
-BOOLEAN:POINTER,INT,INT,UINT
-BOOLEAN:POINTER,POINTER,INT
-BOOLEAN:POINTER,POINTER,INT,INT
-BOOLEAN:POINTER,STRING,STRING,POINTER
+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
-INT:INT
-INT:OBJECT,BOXED,POINTER
+ENUM:VOID
 INT:POINTER
-INT:POINTER,CHAR,CHAR
-INT:VOID
-POINTER:POINTER
-POINTER:POINTER,INT
-POINTER:VOID
+OBJECT:VOID
+STRING:DOUBLE
+STRING:STRING
+VOID:DOUBLE
 VOID:BOOLEAN
+VOID:BOOLEAN,BOOLEAN,BOOLEAN
 VOID:BOXED
+VOID:BOXED,BOXED
+VOID:BOXED,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,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
-VOID:INT,INT,INT,INT
-VOID:INT,INT,POINTER
 VOID:OBJECT
-VOID:ENUM,INT
+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,BOOLEAN
 VOID:POINTER,INT
-VOID:POINTER,INT,INT,POINTER,UINT,UINT
-VOID:POINTER,INT,POINTER
-VOID:POINTER,POINTER
+VOID:POINTER,BOOLEAN
 VOID:POINTER,POINTER,BOOLEAN
-VOID:POINTER,POINTER,INT
-VOID:POINTER,POINTER,INT,BOOLEAN
-VOID:POINTER,POINTER,INT,INT
 VOID:POINTER,POINTER,POINTER
-VOID:POINTER,POINTER,UINT,UINT
-VOID:POINTER,STRING,STRING
 VOID:POINTER,UINT
-VOID:POINTER,UINT,ENUM
-VOID:POINTER,UINT,UINT
 VOID:STRING
+VOID:STRING,BOXED
+VOID:STRING,STRING
+VOID:STRING,STRING,STRING
 VOID:STRING,INT,POINTER
-VOID:STRING,POINTER
-VOID:UINT
-VOID:UINT,BOXED,UINT,FLAGS,FLAGS
-VOID:UINT,POINTER,UINT,ENUM,ENUM,POINTER
-VOID:UINT,POINTER,UINT,UINT,ENUM
+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
-
-# deprecated, compatibility aliases:
-BOOL:NONE
-BOOL:POINTER
-BOOL:POINTER,INT,INT
-BOOL:POINTER,INT,INT,UINT
-BOOL:POINTER,POINTER,INT,INT
-BOOL:POINTER,STRING,STRING,POINTER
-INT:NONE
-POINTER:NONE
-NONE:BOOL
-NONE:BOXED
-NONE:ENUM
-NONE:ENUM,FLOAT
-NONE:ENUM,FLOAT,BOOL
-NONE:INT
-NONE:INT,INT
-NONE:INT,INT,INT
-NONE:INT,INT,POINTER
-NONE:NONE
-NONE:OBJECT
-NONE:POINTER
-NONE:POINTER,INT
-NONE:POINTER,INT,INT,POINTER,UINT,UINT
-NONE:POINTER,INT,POINTER
-NONE:POINTER,POINTER
-NONE:POINTER,POINTER,INT
-NONE:POINTER,POINTER,INT,INT
-NONE:POINTER,POINTER,POINTER
-NONE:POINTER,POINTER,UINT,UINT
-NONE:POINTER,STRING,STRING
-NONE:POINTER,UINT
-NONE:POINTER,UINT,ENUM
-NONE:POINTER,UINT,UINT
-NONE:STRING
-NONE:STRING,INT,POINTER
-NONE:STRING,POINTER
-NONE:UINT
-NONE:UINT,POINTER,UINT,ENUM,ENUM,POINTER
-NONE:UINT,POINTER,UINT,UINT,ENUM
-NONE:UINT,STRING
-VOID:ENUM,FLOAT,BOOL
+OBJECT:OBJECT,INT,INT
+VOID:POINTER,POINTER,POINTER,POINTER,STRING