From cef8bd60e1ff505cc686792440424b57252e4c37 Mon Sep 17 00:00:00 2001 From: Jonathon Jongsma Date: Tue, 15 Dec 2009 14:11:38 -0600 Subject: Use the boxed CamelObject type for signal params in MailFolderCache Previously I was just using G_TYPE_POINTER. Use the boxed camel object type from e-util.h instead. When camel-gobject lands, we'll use G_TYPE_OBJECT instead. --- mail/mail-folder-cache.c | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) (limited to 'mail/mail-folder-cache.c') 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 #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); } -- cgit v1.2.3