1 files changed, 19 insertions, 82 deletions
diff --git a/gtk/gtkmarshalers.list b/gtk/gtkmarshalers.list
index 96579a2d5..5d6cd91cf 100644
--- a/gtk/gtkmarshalers.list
+++ b/gtk/gtkmarshalers.list
@@ -22,112 +22,49 @@
 #   BOOL        deprecated alias for BOOLEAN
 
 BOOLEAN:BOXED
-BOOLEAN:BOXED,BOXED
-BOOLEAN:BOXED,BOXED,INT
-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,INT,INT,UINT
+BOOLEAN:OBJECT,STRING,STRING,BOXED
 BOOLEAN:VOID
-BOXED:BOXED
 ENUM:ENUM
-INT:INT
-INT:BOXED
 INT:OBJECT,BOXED,BOXED
 INT:POINTER
-INT:POINTER,CHAR,CHAR
-INT:VOID
-POINTER:POINTER
-POINTER:POINTER,INT
-POINTER:VOID
+NONE:BOOL
+NONE:INT
+NONE:INT,INT
+NONE:NONE
+NONE:POINTER
+NONE:STRING,INT,POINTER
 VOID:BOOLEAN
 VOID:BOXED
 VOID:BOXED,BOXED
-VOID:BOXED,BOXED,BOOLEAN
-VOID:BOXED,STRING,INT
-VOID:BOXED,INT,POINTER
+VOID:BOXED,BOXED,UINT,UINT
+VOID:BOXED,INT,INT,BOXED,UINT,UINT
 VOID:BOXED,OBJECT
+VOID:BOXED,STRING,INT
+VOID:BOXED,UINT
 VOID:BOXED,UINT,FLAGS
+VOID:BOXED,UINT,UINT
 VOID:ENUM
 VOID:ENUM,FLOAT
-VOID:ENUM,FLOAT,BOOLEAN
+VOID:ENUM,FLOAT,BOOL
+VOID:ENUM,INT
 VOID:ENUM,INT,BOOLEAN
 VOID:INT
 VOID:INT,INT
+VOID:INT,INT,BOXED
 VOID:INT,INT,INT
-VOID:INT,INT,INT,INT
-VOID:INT,INT,POINTER
 VOID:OBJECT
-VOID:OBJECT,BOXED,BOXED
 VOID:OBJECT,BOOLEAN
+VOID:OBJECT,BOXED,BOXED
 VOID:OBJECT,INT,INT
-VOID:ENUM,INT
+VOID:OBJECT,OBJECT
+VOID:OBJECT,STRING,STRING
 VOID:POINTER
-VOID:POINTER,BOOLEAN
 VOID:POINTER,INT
-VOID:POINTER,INT,INT,POINTER,UINT,UINT
-VOID:POINTER,INT,POINTER
-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,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:UINT,STRING
 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