diff options
| -rw-r--r-- | e-util/e-marshal.list | 8 | ||||
| -rw-r--r-- | mail/mail-folder-cache.c | 25 |
2 files changed, 17 insertions, 16 deletions
diff --git a/e-util/e-marshal.list b/e-util/e-marshal.list index cf6133cbd9..b0be6abe05 100644 --- a/e-util/e-marshal.list +++ b/e-util/e-marshal.list @@ -16,6 +16,10 @@ INT:INT,INT,BOXED INT:INT,POINTER,INT,BOXED INT:OBJECT,BOXED INT:POINTER +NONE:BOXED,STRING +NONE:BOXED,STRING,INT +NONE:BOXED,STRING,STRING +NONE:BOXED,STRING,STRING,INT,STRING,STRING,STRING NONE:INT,INT NONE:INT,INT,BOXED NONE:INT,INT,OBJECT @@ -38,10 +42,6 @@ NONE:POINTER,INT,INT,INT,INT NONE:POINTER,INT,OBJECT NONE:POINTER,POINTER NONE:POINTER,POINTER,INT -NONE:POINTER,STRING -NONE:POINTER,STRING,STRING -NONE:POINTER,STRING,INT -NONE:POINTER,STRING,STRING,INT,STRING,STRING,STRING NONE:STRING,DOUBLE NONE:STRING,INT,INT NONE:STRING,POINTER,POINTER diff --git a/mail/mail-folder-cache.c b/mail/mail-folder-cache.c index 6b39e7f269..f43e16e7b8 100644 --- a/mail/mail-folder-cache.c +++ b/mail/mail-folder-cache.c @@ -49,6 +49,7 @@ #include <libedataserver/e-data-server-util.h> #include "e-util/e-marshal.h" +#include "e-util/e-util.h" #include "mail-mt.h" #include "mail-folder-cache.h" @@ -1184,9 +1185,9 @@ mail_folder_cache_class_init (MailFolderCacheClass *klass) G_SIGNAL_RUN_FIRST, 0, /* struct offset */ NULL, NULL, /* accumulator */ - e_marshal_VOID__POINTER_STRING, + e_marshal_VOID__BOXED_STRING, G_TYPE_NONE, 2, - G_TYPE_POINTER, G_TYPE_STRING); + E_TYPE_CAMEL_OBJECT, G_TYPE_STRING); /** * MailFolderCache::folder-unavailable @@ -1203,9 +1204,9 @@ mail_folder_cache_class_init (MailFolderCacheClass *klass) G_SIGNAL_RUN_FIRST, 0, /* struct offset */ NULL, NULL, /* accumulator */ - e_marshal_VOID__POINTER_STRING, + e_marshal_VOID__BOXED_STRING, G_TYPE_NONE, 2, - G_TYPE_POINTER, G_TYPE_STRING); + E_TYPE_CAMEL_OBJECT, G_TYPE_STRING); /** * MailFolderCache::folder-deleted @@ -1220,9 +1221,9 @@ mail_folder_cache_class_init (MailFolderCacheClass *klass) G_SIGNAL_RUN_FIRST, 0, /* struct offset */ NULL, NULL, /* accumulator */ - e_marshal_VOID__POINTER_STRING, + e_marshal_VOID__BOXED_STRING, G_TYPE_NONE, 2, - G_TYPE_POINTER, G_TYPE_STRING); + E_TYPE_CAMEL_OBJECT, G_TYPE_STRING); /** * MailFolderCache::folder-renamed @@ -1238,9 +1239,9 @@ mail_folder_cache_class_init (MailFolderCacheClass *klass) G_SIGNAL_RUN_FIRST, 0, /* struct offset */ NULL, NULL, /* accumulator */ - e_marshal_VOID__POINTER_STRING_STRING, + e_marshal_VOID__BOXED_STRING_STRING, G_TYPE_NONE, 3, - G_TYPE_POINTER, G_TYPE_STRING, G_TYPE_STRING); + E_TYPE_CAMEL_OBJECT, G_TYPE_STRING, G_TYPE_STRING); /** * MailFolderCache::folder-unread-updated @@ -1256,9 +1257,9 @@ mail_folder_cache_class_init (MailFolderCacheClass *klass) G_SIGNAL_RUN_FIRST, 0, /* struct offset */ NULL, NULL, /* accumulator */ - e_marshal_VOID__POINTER_STRING_INT, + e_marshal_VOID__BOXED_STRING_INT, G_TYPE_NONE, 3, - G_TYPE_POINTER, G_TYPE_STRING, G_TYPE_INT); + E_TYPE_CAMEL_OBJECT, G_TYPE_STRING, G_TYPE_INT); /** * MailFolderCache::folder-changed @@ -1279,9 +1280,9 @@ mail_folder_cache_class_init (MailFolderCacheClass *klass) G_SIGNAL_RUN_FIRST, 0, /* struct offset */ NULL, NULL, /* accumulator */ - e_marshal_VOID__POINTER_STRING_STRING_INT_STRING_STRING_STRING, + e_marshal_VOID__BOXED_STRING_STRING_INT_STRING_STRING_STRING, G_TYPE_NONE, 7, - G_TYPE_POINTER, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_INT, + E_TYPE_CAMEL_OBJECT, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_INT, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING); } |