This is a manual merge of branch drop split view intro trunk.

[modest] / src / modest-marshal.list

diff --git a/src/modest-marshal.list b/src/modest-marshal.list
index 73b8a4d..060ea05 100644 (file)
--- a/src/modest-marshal.list
+++ b/src/modest-marshal.list
@@ -1,6 +1,14 @@
 VOID:POINTER,POINTER
 VOID:POINTER,POINTER,POINTER
+VOID:STRING,POINTER,POINTER,POINTER,POINTER
+VOID:STRING,STRING,BOOL        
+VOID:POINTER,BOOL
 VOID:STRING,INT
+VOID:STRING,INT,INT
 VOID:STRING,BOOL
-VOID:STRING,STRING,BOOL
-VOID:STRING,POINTER,POINTER
+VOID:STRING,POINTER,BOOL
+VOID:POINTER,INT
+BOOL:STRING
+BOOL:STRING,OBJECT
+BOOL:ENUM,BOOL
+BOOL:ENUM