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 c18388f8e083ec84a06e52b760230458845aaee2..e081da60dc525e7d3cf7ccea2259e78335d91abc 100644 (file)
--- a/gtk/gtkmarshalers.list
+++ b/gtk/gtkmarshalers.list
@@ -32,6 +32,7 @@ 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
@@ -77,6 +78,8 @@ 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