Merge the gtk-printing branch. For more detailed ChangeLog entries, see

[~andy/gtk] / gtk / gtkmarshalers.list

diff --git a/gtk/gtkmarshalers.list b/gtk/gtkmarshalers.list
index 1746d351fa6a44821ffe1e6d8c217d6e26e923e5..e081da60dc525e7d3cf7ccea2259e78335d91abc 100644 (file)
--- a/gtk/gtkmarshalers.list
+++ b/gtk/gtkmarshalers.list
@@ -23,33 +23,51 @@
 
 BOOLEAN:BOXED
 BOOLEAN:BOXED,BOXED
+BOOLEAN:ENUM
+BOOLEAN:ENUM,DOUBLE
+BOOLEAN:ENUM,INT
+BOOLEAN:OBJECT,UINT,FLAGS
 BOOLEAN:OBJECT,INT,INT,UINT
 BOOLEAN:OBJECT,STRING,STRING,BOXED
+BOOLEAN:OBJECT,BOXED
 BOOLEAN:OBJECT,BOXED,BOXED
+BOOLEAN:OBJECT,STRING,STRING
+BOOLEAN:INT
+BOOLEAN:INT,INT
+BOOLEAN:INT,INT,INT
+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
+STRING:DOUBLE
+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:INT
@@ -60,17 +78,30 @@ 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,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