[evolution/email-factory-3-4: 37/53] fix compilation errors.
- From: Srinivasa Ragavan <sragavan src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution/email-factory-3-4: 37/53] fix compilation errors.
- Date: Tue, 17 Jan 2012 14:57:36 +0000 (UTC)
commit 343eed55b504f849bccfb3b091d2b744cce1774f
Author: Srinivasa Ragavan <sragavan gnome org>
Date: Fri Dec 16 16:18:17 2011 +0530
fix compilation errors.
libemail-engine/Makefile.am | 4 +-
libemail-engine/e-mail-session.c | 18 -----
libemail-engine/e-mail-session.h | 1 +
libemail-engine/mail-folder-cache.c | 16 ++--
libemail-engine/mail-folder-cache.h | 6 +-
libemail-engine/mail-ops.c | 5 +-
libemail-utils/e-marshal.c | 145 ++++++++++++++++++++++-------------
libemail-utils/e-marshal.h | 112 ++++++++++++++-------------
mail/e-mail-ui-session.c | 18 +++++
9 files changed, 188 insertions(+), 137 deletions(-)
---
diff --git a/libemail-engine/Makefile.am b/libemail-engine/Makefile.am
index fd62daf..e450a87 100644
--- a/libemail-engine/Makefile.am
+++ b/libemail-engine/Makefile.am
@@ -21,7 +21,6 @@ libemail_engine_la_LIBADD = \
libemail_engine_la_LDFLAGS =
libemail_engine_la_SOURCES = \
- e-mail-local.c \
e-mail-folder-utils.c \
e-mail-store-utils.c \
mail-tools.c \
@@ -31,8 +30,7 @@ libemail_engine_la_SOURCES = \
e-mail-session-utils.c \
mail-ops.c \
e-mail-junk-filter.c \
- e-mail-session.c \
- e-mail-store.c
+ e-mail-session.c
libmailengineincludedir = $(privincludedir)/libemail-engine
libmailengineinclude_HEADERS = \
diff --git a/libemail-engine/e-mail-session.c b/libemail-engine/e-mail-session.c
index d0cda25..9df4695 100644
--- a/libemail-engine/e-mail-session.c
+++ b/libemail-engine/e-mail-session.c
@@ -53,7 +53,6 @@
#include "libemail-utils/gconf-bridge.h"
#include "e-mail-junk-filter.h"
-#include "e-mail-local.h"
#include "e-mail-session.h"
#include "e-mail-folder-utils.h"
#include "e-mail-utils.h"
@@ -66,7 +65,6 @@
((obj), E_TYPE_MAIL_SESSION, EMailSessionPrivate))
typedef struct _AsyncContext AsyncContext;
-typedef struct _SourceContext SourceContext;
struct _EMailSessionPrivate {
MailFolderCache *folder_cache;
@@ -95,11 +93,6 @@ struct _AsyncContext {
CamelFolder *folder;
};
-struct _SourceContext {
- EMailSession *session;
- CamelService *service;
-};
-
enum {
PROP_0,
PROP_FOLDER_CACHE,
@@ -341,17 +334,6 @@ async_context_free (AsyncContext *context)
g_slice_free (AsyncContext, context);
}
-static void
-source_context_free (SourceContext *context)
-{
- if (context->session != NULL)
- g_object_unref (context->session);
-
- if (context->service != NULL)
- g_object_unref (context->service);
-
- g_slice_free (SourceContext, context);
-}
static gchar *
mail_session_make_key (CamelService *service,
diff --git a/libemail-engine/e-mail-session.h b/libemail-engine/e-mail-session.h
index b22f3f7..019d49d 100644
--- a/libemail-engine/e-mail-session.h
+++ b/libemail-engine/e-mail-session.h
@@ -26,6 +26,7 @@
#define E_MAIL_SESSION_H
#include <camel/camel.h>
+#include <libemail-engine/e-mail-enums.h>
#include <libemail-engine/mail-folder-cache.h>
/* Standard GObject macros */
diff --git a/libemail-engine/mail-folder-cache.c b/libemail-engine/mail-folder-cache.c
index 648b40f..9a239b5 100644
--- a/libemail-engine/mail-folder-cache.c
+++ b/libemail-engine/mail-folder-cache.c
@@ -1106,7 +1106,7 @@ mail_folder_cache_service_disabled (MailFolderCache *cache,
/* To the folder cache, disabling a service is the same as
* removing it. We keep a separate callback function only
* to use as a breakpoint target in a debugger. */
- mail_folder_cache_service_removed (account_store, service, cache);
+ mail_folder_cache_service_removed (cache, service);
}
static void
@@ -1163,7 +1163,8 @@ mail_folder_cache_dispose (GObject *object)
{
MailFolderCachePrivate *priv;
- priv = MAIL_FOLDER_CACHE_GET_PRIVATE (object);
+ priv = G_TYPE_INSTANCE_GET_PRIVATE (
+ object, MAIL_TYPE_FOLDER_CACHE, MailFolderCachePrivate);
if (priv->session != NULL) {
g_object_remove_weak_pointer (
@@ -1180,7 +1181,8 @@ mail_folder_cache_finalize (GObject *object)
{
MailFolderCachePrivate *priv;
- priv = MAIL_FOLDER_CACHE_GET_PRIVATE (object);
+ priv = G_TYPE_INSTANCE_GET_PRIVATE (
+ object, MAIL_TYPE_FOLDER_CACHE, MailFolderCachePrivate);
g_hash_table_destroy (priv->stores);
g_mutex_free (priv->stores_mutex);
@@ -1545,8 +1547,8 @@ mail_folder_cache_init (MailFolderCache *self)
self->priv->ping_id = g_timeout_add_seconds (
timeout, (GSourceFunc) ping_cb, self);
- g_queue_init (&cache->priv->local_folder_uris);
- g_queue_init (&cache->priv->remote_folder_uris);
+ g_queue_init (&self->priv->local_folder_uris);
+ g_queue_init (&self->priv->remote_folder_uris);
}
MailFolderCache *
@@ -1586,7 +1588,7 @@ mail_folder_cache_note_store (MailFolderCache *self,
struct _update_data *ud;
gint hook = 0;
- g_return_if_fail (MAIL_IS_FOLDER_CACHE (cache));
+ g_return_if_fail (MAIL_IS_FOLDER_CACHE (self));
g_return_if_fail (CAMEL_IS_STORE (store));
session = camel_service_get_session (CAMEL_SERVICE (store));
@@ -1691,7 +1693,7 @@ mail_folder_cache_note_folder (MailFolderCache *self,
struct _folder_info *mfi;
const gchar *full_name;
- g_return_if_fail (MAIL_IS_FOLDER_CACHE (cache));
+ g_return_if_fail (MAIL_IS_FOLDER_CACHE (self));
g_return_if_fail (CAMEL_IS_FOLDER (folder));
full_name = camel_folder_get_full_name (folder);
diff --git a/libemail-engine/mail-folder-cache.h b/libemail-engine/mail-folder-cache.h
index 8c8f741..b0d1d1b 100644
--- a/libemail-engine/mail-folder-cache.h
+++ b/libemail-engine/mail-folder-cache.h
@@ -110,8 +110,8 @@ struct _MailFolderCacheClass {
GType mail_folder_cache_get_type (void) G_GNUC_CONST;
MailFolderCache *
- mail_folder_cache_new (EMailSession *session);
-struct _EMailSession
+ mail_folder_cache_new (struct _EMailSession *session);
+struct _EMailSession *
mail_folder_cache_get_session (MailFolderCache *cache);
void mail_folder_cache_note_store (MailFolderCache *cache,
CamelStore *store,
@@ -141,7 +141,7 @@ void mail_folder_cache_get_remote_folder_uris
void mail_folder_cache_service_added (MailFolderCache *cache,
CamelService *service);
void mail_folder_cache_service_removed
- (MailFolderCache *cache
+ (MailFolderCache *cache,
CamelService *service);
void mail_folder_cache_service_enabled
(MailFolderCache *cache,
diff --git a/libemail-engine/mail-ops.c b/libemail-engine/mail-ops.c
index 8620c56..e9bf888 100644
--- a/libemail-engine/mail-ops.c
+++ b/libemail-engine/mail-ops.c
@@ -813,7 +813,7 @@ send_queue_exec (struct _send_queue_msg *m,
d(printf("sending queue\n"));
- session = e_mail_backend_get_session (m->backend);
+ session = m->session;
sent_folder =
e_mail_session_get_local_folder (
@@ -1499,7 +1499,8 @@ expunge_folder_exec (struct _sync_folder_msg *m,
gboolean success = TRUE;
const gchar *uid;
- session = e_mail_backend_get_session (m->backend);
+ session = m->session;
+
parent_store = camel_folder_get_parent_store (m->folder);
uid = camel_service_get_uid (CAMEL_SERVICE (parent_store));
store_is_local = (g_strcmp0 (uid, E_MAIL_SESSION_LOCAL_UID) == 0);
diff --git a/libemail-utils/e-marshal.c b/libemail-utils/e-marshal.c
index ded48ce..e653b3b 100644
--- a/libemail-utils/e-marshal.c
+++ b/libemail-utils/e-marshal.c
@@ -437,7 +437,48 @@ e_marshal_BOOLEAN__OBJECT (GClosure *closure,
g_value_set_boolean (return_value, v_return);
}
-/* BOOLEAN:OBJECT,DOUBLE,DOUBLE,BOOLEAN (e-marshal.list:10) */
+/* BOOLEAN:OBJECT,OBJECT (e-marshal.list:10) */
+void
+e_marshal_BOOLEAN__OBJECT_OBJECT (GClosure *closure,
+ GValue *return_value G_GNUC_UNUSED,
+ guint n_param_values,
+ const GValue *param_values,
+ gpointer invocation_hint G_GNUC_UNUSED,
+ gpointer marshal_data)
+{
+ typedef gboolean (*GMarshalFunc_BOOLEAN__OBJECT_OBJECT) (gpointer data1,
+ gpointer arg_1,
+ gpointer arg_2,
+ gpointer data2);
+ register GMarshalFunc_BOOLEAN__OBJECT_OBJECT callback;
+ register GCClosure *cc = (GCClosure*) closure;
+ register gpointer data1, data2;
+ gboolean v_return;
+
+ g_return_if_fail (return_value != NULL);
+ g_return_if_fail (n_param_values == 3);
+
+ if (G_CCLOSURE_SWAP_DATA (closure))
+ {
+ data1 = closure->data;
+ data2 = g_value_peek_pointer (param_values + 0);
+ }
+ else
+ {
+ data1 = g_value_peek_pointer (param_values + 0);
+ data2 = closure->data;
+ }
+ callback = (GMarshalFunc_BOOLEAN__OBJECT_OBJECT) (marshal_data ? marshal_data : cc->callback);
+
+ v_return = callback (data1,
+ g_marshal_value_peek_object (param_values + 1),
+ g_marshal_value_peek_object (param_values + 2),
+ data2);
+
+ g_value_set_boolean (return_value, v_return);
+}
+
+/* BOOLEAN:OBJECT,DOUBLE,DOUBLE,BOOLEAN (e-marshal.list:11) */
void
e_marshal_BOOLEAN__OBJECT_DOUBLE_DOUBLE_BOOLEAN (GClosure *closure,
GValue *return_value G_GNUC_UNUSED,
@@ -482,7 +523,7 @@ e_marshal_BOOLEAN__OBJECT_DOUBLE_DOUBLE_BOOLEAN (GClosure *closure,
g_value_set_boolean (return_value, v_return);
}
-/* BOOLEAN:POINTER (e-marshal.list:11) */
+/* BOOLEAN:POINTER (e-marshal.list:12) */
void
e_marshal_BOOLEAN__POINTER (GClosure *closure,
GValue *return_value G_GNUC_UNUSED,
@@ -521,7 +562,7 @@ e_marshal_BOOLEAN__POINTER (GClosure *closure,
g_value_set_boolean (return_value, v_return);
}
-/* BOOLEAN:POINTER,BOOLEAN,POINTER (e-marshal.list:12) */
+/* BOOLEAN:POINTER,BOOLEAN,POINTER (e-marshal.list:13) */
void
e_marshal_BOOLEAN__POINTER_BOOLEAN_POINTER (GClosure *closure,
GValue *return_value G_GNUC_UNUSED,
@@ -564,7 +605,7 @@ e_marshal_BOOLEAN__POINTER_BOOLEAN_POINTER (GClosure *closure,
g_value_set_boolean (return_value, v_return);
}
-/* BOOLEAN:POINTER,POINTER (e-marshal.list:13) */
+/* BOOLEAN:POINTER,POINTER (e-marshal.list:14) */
void
e_marshal_BOOLEAN__POINTER_POINTER (GClosure *closure,
GValue *return_value G_GNUC_UNUSED,
@@ -605,7 +646,7 @@ e_marshal_BOOLEAN__POINTER_POINTER (GClosure *closure,
g_value_set_boolean (return_value, v_return);
}
-/* BOOLEAN:POINTER,POINTER,POINTER,POINTER (e-marshal.list:14) */
+/* BOOLEAN:POINTER,POINTER,POINTER,POINTER (e-marshal.list:15) */
void
e_marshal_BOOLEAN__POINTER_POINTER_POINTER_POINTER (GClosure *closure,
GValue *return_value G_GNUC_UNUSED,
@@ -650,7 +691,7 @@ e_marshal_BOOLEAN__POINTER_POINTER_POINTER_POINTER (GClosure *closure,
g_value_set_boolean (return_value, v_return);
}
-/* BOOLEAN:STRING (e-marshal.list:15) */
+/* BOOLEAN:STRING (e-marshal.list:16) */
void
e_marshal_BOOLEAN__STRING (GClosure *closure,
GValue *return_value G_GNUC_UNUSED,
@@ -689,7 +730,7 @@ e_marshal_BOOLEAN__STRING (GClosure *closure,
g_value_set_boolean (return_value, v_return);
}
-/* BOOLEAN:STRING,INT (e-marshal.list:16) */
+/* BOOLEAN:STRING,INT (e-marshal.list:17) */
void
e_marshal_BOOLEAN__STRING_INT (GClosure *closure,
GValue *return_value G_GNUC_UNUSED,
@@ -730,7 +771,7 @@ e_marshal_BOOLEAN__STRING_INT (GClosure *closure,
g_value_set_boolean (return_value, v_return);
}
-/* DOUBLE:OBJECT,DOUBLE,DOUBLE,BOOLEAN (e-marshal.list:17) */
+/* DOUBLE:OBJECT,DOUBLE,DOUBLE,BOOLEAN (e-marshal.list:18) */
void
e_marshal_DOUBLE__OBJECT_DOUBLE_DOUBLE_BOOLEAN (GClosure *closure,
GValue *return_value G_GNUC_UNUSED,
@@ -775,7 +816,7 @@ e_marshal_DOUBLE__OBJECT_DOUBLE_DOUBLE_BOOLEAN (GClosure *closure,
g_value_set_double (return_value, v_return);
}
-/* INT:BOXED (e-marshal.list:18) */
+/* INT:BOXED (e-marshal.list:19) */
void
e_marshal_INT__BOXED (GClosure *closure,
GValue *return_value G_GNUC_UNUSED,
@@ -814,7 +855,7 @@ e_marshal_INT__BOXED (GClosure *closure,
g_value_set_int (return_value, v_return);
}
-/* INT:INT (e-marshal.list:19) */
+/* INT:INT (e-marshal.list:20) */
void
e_marshal_INT__INT (GClosure *closure,
GValue *return_value G_GNUC_UNUSED,
@@ -853,7 +894,7 @@ e_marshal_INT__INT (GClosure *closure,
g_value_set_int (return_value, v_return);
}
-/* INT:INT,INT,BOXED (e-marshal.list:20) */
+/* INT:INT,INT,BOXED (e-marshal.list:21) */
void
e_marshal_INT__INT_INT_BOXED (GClosure *closure,
GValue *return_value G_GNUC_UNUSED,
@@ -896,7 +937,7 @@ e_marshal_INT__INT_INT_BOXED (GClosure *closure,
g_value_set_int (return_value, v_return);
}
-/* INT:INT,POINTER,INT,BOXED (e-marshal.list:21) */
+/* INT:INT,POINTER,INT,BOXED (e-marshal.list:22) */
void
e_marshal_INT__INT_POINTER_INT_BOXED (GClosure *closure,
GValue *return_value G_GNUC_UNUSED,
@@ -941,7 +982,7 @@ e_marshal_INT__INT_POINTER_INT_BOXED (GClosure *closure,
g_value_set_int (return_value, v_return);
}
-/* INT:OBJECT,BOXED (e-marshal.list:22) */
+/* INT:OBJECT,BOXED (e-marshal.list:23) */
void
e_marshal_INT__OBJECT_BOXED (GClosure *closure,
GValue *return_value G_GNUC_UNUSED,
@@ -982,7 +1023,7 @@ e_marshal_INT__OBJECT_BOXED (GClosure *closure,
g_value_set_int (return_value, v_return);
}
-/* INT:POINTER (e-marshal.list:23) */
+/* INT:POINTER (e-marshal.list:24) */
void
e_marshal_INT__POINTER (GClosure *closure,
GValue *return_value G_GNUC_UNUSED,
@@ -1021,7 +1062,7 @@ e_marshal_INT__POINTER (GClosure *closure,
g_value_set_int (return_value, v_return);
}
-/* NONE:BOXED,INT (e-marshal.list:24) */
+/* NONE:BOXED,INT (e-marshal.list:25) */
void
e_marshal_VOID__BOXED_INT (GClosure *closure,
GValue *return_value G_GNUC_UNUSED,
@@ -1058,7 +1099,7 @@ e_marshal_VOID__BOXED_INT (GClosure *closure,
data2);
}
-/* NONE:ENUM,OBJECT,OBJECT (e-marshal.list:25) */
+/* NONE:ENUM,OBJECT,OBJECT (e-marshal.list:26) */
void
e_marshal_VOID__ENUM_OBJECT_OBJECT (GClosure *closure,
GValue *return_value G_GNUC_UNUSED,
@@ -1097,7 +1138,7 @@ e_marshal_VOID__ENUM_OBJECT_OBJECT (GClosure *closure,
data2);
}
-/* NONE:INT,INT (e-marshal.list:26) */
+/* NONE:INT,INT (e-marshal.list:27) */
void
e_marshal_VOID__INT_INT (GClosure *closure,
GValue *return_value G_GNUC_UNUSED,
@@ -1134,7 +1175,7 @@ e_marshal_VOID__INT_INT (GClosure *closure,
data2);
}
-/* NONE:INT,INT,BOXED (e-marshal.list:27) */
+/* NONE:INT,INT,BOXED (e-marshal.list:28) */
void
e_marshal_VOID__INT_INT_BOXED (GClosure *closure,
GValue *return_value G_GNUC_UNUSED,
@@ -1173,7 +1214,7 @@ e_marshal_VOID__INT_INT_BOXED (GClosure *closure,
data2);
}
-/* NONE:INT,INT,OBJECT (e-marshal.list:28) */
+/* NONE:INT,INT,OBJECT (e-marshal.list:29) */
void
e_marshal_VOID__INT_INT_OBJECT (GClosure *closure,
GValue *return_value G_GNUC_UNUSED,
@@ -1212,7 +1253,7 @@ e_marshal_VOID__INT_INT_OBJECT (GClosure *closure,
data2);
}
-/* NONE:INT,INT,OBJECT,BOXED,UINT,UINT (e-marshal.list:29) */
+/* NONE:INT,INT,OBJECT,BOXED,UINT,UINT (e-marshal.list:30) */
void
e_marshal_VOID__INT_INT_OBJECT_BOXED_UINT_UINT (GClosure *closure,
GValue *return_value G_GNUC_UNUSED,
@@ -1257,7 +1298,7 @@ e_marshal_VOID__INT_INT_OBJECT_BOXED_UINT_UINT (GClosure *closure,
data2);
}
-/* NONE:INT,INT,OBJECT,INT,INT,BOXED,UINT,UINT (e-marshal.list:30) */
+/* NONE:INT,INT,OBJECT,INT,INT,BOXED,UINT,UINT (e-marshal.list:31) */
void
e_marshal_VOID__INT_INT_OBJECT_INT_INT_BOXED_UINT_UINT (GClosure *closure,
GValue *return_value G_GNUC_UNUSED,
@@ -1306,7 +1347,7 @@ e_marshal_VOID__INT_INT_OBJECT_INT_INT_BOXED_UINT_UINT (GClosure *closure,
data2);
}
-/* NONE:INT,INT,OBJECT,UINT (e-marshal.list:31) */
+/* NONE:INT,INT,OBJECT,UINT (e-marshal.list:32) */
void
e_marshal_VOID__INT_INT_OBJECT_UINT (GClosure *closure,
GValue *return_value G_GNUC_UNUSED,
@@ -1347,7 +1388,7 @@ e_marshal_VOID__INT_INT_OBJECT_UINT (GClosure *closure,
data2);
}
-/* NONE:INT,OBJECT (e-marshal.list:32) */
+/* NONE:INT,OBJECT (e-marshal.list:33) */
void
e_marshal_VOID__INT_OBJECT (GClosure *closure,
GValue *return_value G_GNUC_UNUSED,
@@ -1384,7 +1425,7 @@ e_marshal_VOID__INT_OBJECT (GClosure *closure,
data2);
}
-/* NONE:INT,POINTER (e-marshal.list:33) */
+/* NONE:INT,POINTER (e-marshal.list:34) */
void
e_marshal_VOID__INT_POINTER (GClosure *closure,
GValue *return_value G_GNUC_UNUSED,
@@ -1421,7 +1462,7 @@ e_marshal_VOID__INT_POINTER (GClosure *closure,
data2);
}
-/* NONE:INT,POINTER,INT,BOXED (e-marshal.list:34) */
+/* NONE:INT,POINTER,INT,BOXED (e-marshal.list:35) */
void
e_marshal_VOID__INT_POINTER_INT_BOXED (GClosure *closure,
GValue *return_value G_GNUC_UNUSED,
@@ -1462,7 +1503,7 @@ e_marshal_VOID__INT_POINTER_INT_BOXED (GClosure *closure,
data2);
}
-/* NONE:INT,POINTER,INT,OBJECT (e-marshal.list:35) */
+/* NONE:INT,POINTER,INT,OBJECT (e-marshal.list:36) */
void
e_marshal_VOID__INT_POINTER_INT_OBJECT (GClosure *closure,
GValue *return_value G_GNUC_UNUSED,
@@ -1503,7 +1544,7 @@ e_marshal_VOID__INT_POINTER_INT_OBJECT (GClosure *closure,
data2);
}
-/* NONE:INT,POINTER,INT,OBJECT,BOXED,UINT,UINT (e-marshal.list:36) */
+/* NONE:INT,POINTER,INT,OBJECT,BOXED,UINT,UINT (e-marshal.list:37) */
void
e_marshal_VOID__INT_POINTER_INT_OBJECT_BOXED_UINT_UINT (GClosure *closure,
GValue *return_value G_GNUC_UNUSED,
@@ -1550,7 +1591,7 @@ e_marshal_VOID__INT_POINTER_INT_OBJECT_BOXED_UINT_UINT (GClosure *closure,
data2);
}
-/* NONE:INT,POINTER,INT,OBJECT,INT,INT,BOXED,UINT,UINT (e-marshal.list:37) */
+/* NONE:INT,POINTER,INT,OBJECT,INT,INT,BOXED,UINT,UINT (e-marshal.list:38) */
void
e_marshal_VOID__INT_POINTER_INT_OBJECT_INT_INT_BOXED_UINT_UINT (GClosure *closure,
GValue *return_value G_GNUC_UNUSED,
@@ -1601,7 +1642,7 @@ e_marshal_VOID__INT_POINTER_INT_OBJECT_INT_INT_BOXED_UINT_UINT (GClosure *cl
data2);
}
-/* NONE:INT,POINTER,INT,OBJECT,UINT (e-marshal.list:38) */
+/* NONE:INT,POINTER,INT,OBJECT,UINT (e-marshal.list:39) */
void
e_marshal_VOID__INT_POINTER_INT_OBJECT_UINT (GClosure *closure,
GValue *return_value G_GNUC_UNUSED,
@@ -1644,7 +1685,7 @@ e_marshal_VOID__INT_POINTER_INT_OBJECT_UINT (GClosure *closure,
data2);
}
-/* NONE:LONG,LONG (e-marshal.list:39) */
+/* NONE:LONG,LONG (e-marshal.list:40) */
void
e_marshal_VOID__LONG_LONG (GClosure *closure,
GValue *return_value G_GNUC_UNUSED,
@@ -1681,7 +1722,7 @@ e_marshal_VOID__LONG_LONG (GClosure *closure,
data2);
}
-/* NONE:OBJECT,BOOLEAN (e-marshal.list:40) */
+/* NONE:OBJECT,BOOLEAN (e-marshal.list:41) */
void
e_marshal_VOID__OBJECT_BOOLEAN (GClosure *closure,
GValue *return_value G_GNUC_UNUSED,
@@ -1718,7 +1759,7 @@ e_marshal_VOID__OBJECT_BOOLEAN (GClosure *closure,
data2);
}
-/* NONE:OBJECT,DOUBLE,DOUBLE,BOOLEAN (e-marshal.list:41) */
+/* NONE:OBJECT,DOUBLE,DOUBLE,BOOLEAN (e-marshal.list:42) */
void
e_marshal_VOID__OBJECT_DOUBLE_DOUBLE_BOOLEAN (GClosure *closure,
GValue *return_value G_GNUC_UNUSED,
@@ -1759,7 +1800,7 @@ e_marshal_VOID__OBJECT_DOUBLE_DOUBLE_BOOLEAN (GClosure *closure,
data2);
}
-/* NONE:OBJECT,OBJECT (e-marshal.list:42) */
+/* NONE:OBJECT,OBJECT (e-marshal.list:43) */
void
e_marshal_VOID__OBJECT_OBJECT (GClosure *closure,
GValue *return_value G_GNUC_UNUSED,
@@ -1796,7 +1837,7 @@ e_marshal_VOID__OBJECT_OBJECT (GClosure *closure,
data2);
}
-/* NONE:OBJECT,STRING (e-marshal.list:43) */
+/* NONE:OBJECT,STRING (e-marshal.list:44) */
void
e_marshal_VOID__OBJECT_STRING (GClosure *closure,
GValue *return_value G_GNUC_UNUSED,
@@ -1833,7 +1874,7 @@ e_marshal_VOID__OBJECT_STRING (GClosure *closure,
data2);
}
-/* NONE:OBJECT,STRING,INT (e-marshal.list:44) */
+/* NONE:OBJECT,STRING,INT (e-marshal.list:45) */
void
e_marshal_VOID__OBJECT_STRING_INT (GClosure *closure,
GValue *return_value G_GNUC_UNUSED,
@@ -1872,7 +1913,7 @@ e_marshal_VOID__OBJECT_STRING_INT (GClosure *closure,
data2);
}
-/* NONE:OBJECT,STRING,INT,STRING,STRING,STRING (e-marshal.list:45) */
+/* NONE:OBJECT,STRING,INT,STRING,STRING,STRING (e-marshal.list:46) */
void
e_marshal_VOID__OBJECT_STRING_INT_STRING_STRING_STRING (GClosure *closure,
GValue *return_value G_GNUC_UNUSED,
@@ -1917,7 +1958,7 @@ e_marshal_VOID__OBJECT_STRING_INT_STRING_STRING_STRING (GClosure *closure,
data2);
}
-/* NONE:OBJECT,STRING,STRING (e-marshal.list:46) */
+/* NONE:OBJECT,STRING,STRING (e-marshal.list:47) */
void
e_marshal_VOID__OBJECT_STRING_STRING (GClosure *closure,
GValue *return_value G_GNUC_UNUSED,
@@ -1956,7 +1997,7 @@ e_marshal_VOID__OBJECT_STRING_STRING (GClosure *closure,
data2);
}
-/* NONE:OBJECT,STRING,UINT (e-marshal.list:47) */
+/* NONE:OBJECT,STRING,UINT (e-marshal.list:48) */
void
e_marshal_VOID__OBJECT_STRING_UINT (GClosure *closure,
GValue *return_value G_GNUC_UNUSED,
@@ -1995,7 +2036,7 @@ e_marshal_VOID__OBJECT_STRING_UINT (GClosure *closure,
data2);
}
-/* NONE:POINTER,INT (e-marshal.list:48) */
+/* NONE:POINTER,INT (e-marshal.list:49) */
void
e_marshal_VOID__POINTER_INT (GClosure *closure,
GValue *return_value G_GNUC_UNUSED,
@@ -2032,7 +2073,7 @@ e_marshal_VOID__POINTER_INT (GClosure *closure,
data2);
}
-/* NONE:POINTER,INT,INT,INT,INT (e-marshal.list:49) */
+/* NONE:POINTER,INT,INT,INT,INT (e-marshal.list:50) */
void
e_marshal_VOID__POINTER_INT_INT_INT_INT (GClosure *closure,
GValue *return_value G_GNUC_UNUSED,
@@ -2075,7 +2116,7 @@ e_marshal_VOID__POINTER_INT_INT_INT_INT (GClosure *closure,
data2);
}
-/* NONE:POINTER,INT,OBJECT (e-marshal.list:50) */
+/* NONE:POINTER,INT,OBJECT (e-marshal.list:51) */
void
e_marshal_VOID__POINTER_INT_OBJECT (GClosure *closure,
GValue *return_value G_GNUC_UNUSED,
@@ -2114,7 +2155,7 @@ e_marshal_VOID__POINTER_INT_OBJECT (GClosure *closure,
data2);
}
-/* NONE:POINTER,OBJECT (e-marshal.list:51) */
+/* NONE:POINTER,OBJECT (e-marshal.list:52) */
void
e_marshal_VOID__POINTER_OBJECT (GClosure *closure,
GValue *return_value G_GNUC_UNUSED,
@@ -2151,7 +2192,7 @@ e_marshal_VOID__POINTER_OBJECT (GClosure *closure,
data2);
}
-/* NONE:POINTER,POINTER (e-marshal.list:52) */
+/* NONE:POINTER,POINTER (e-marshal.list:53) */
void
e_marshal_VOID__POINTER_POINTER (GClosure *closure,
GValue *return_value G_GNUC_UNUSED,
@@ -2188,7 +2229,7 @@ e_marshal_VOID__POINTER_POINTER (GClosure *closure,
data2);
}
-/* NONE:POINTER,POINTER,INT (e-marshal.list:53) */
+/* NONE:POINTER,POINTER,INT (e-marshal.list:54) */
void
e_marshal_VOID__POINTER_POINTER_INT (GClosure *closure,
GValue *return_value G_GNUC_UNUSED,
@@ -2227,7 +2268,7 @@ e_marshal_VOID__POINTER_POINTER_INT (GClosure *closure,
data2);
}
-/* NONE:STRING,DOUBLE (e-marshal.list:54) */
+/* NONE:STRING,DOUBLE (e-marshal.list:55) */
void
e_marshal_VOID__STRING_DOUBLE (GClosure *closure,
GValue *return_value G_GNUC_UNUSED,
@@ -2264,7 +2305,7 @@ e_marshal_VOID__STRING_DOUBLE (GClosure *closure,
data2);
}
-/* NONE:STRING,INT (e-marshal.list:55) */
+/* NONE:STRING,INT (e-marshal.list:56) */
void
e_marshal_VOID__STRING_INT (GClosure *closure,
GValue *return_value G_GNUC_UNUSED,
@@ -2301,7 +2342,7 @@ e_marshal_VOID__STRING_INT (GClosure *closure,
data2);
}
-/* NONE:STRING,INT,INT (e-marshal.list:56) */
+/* NONE:STRING,INT,INT (e-marshal.list:57) */
void
e_marshal_VOID__STRING_INT_INT (GClosure *closure,
GValue *return_value G_GNUC_UNUSED,
@@ -2340,7 +2381,7 @@ e_marshal_VOID__STRING_INT_INT (GClosure *closure,
data2);
}
-/* NONE:STRING,OBJECT (e-marshal.list:57) */
+/* NONE:STRING,OBJECT (e-marshal.list:58) */
void
e_marshal_VOID__STRING_OBJECT (GClosure *closure,
GValue *return_value G_GNUC_UNUSED,
@@ -2377,7 +2418,7 @@ e_marshal_VOID__STRING_OBJECT (GClosure *closure,
data2);
}
-/* NONE:STRING,POINTER,POINTER (e-marshal.list:58) */
+/* NONE:STRING,POINTER,POINTER (e-marshal.list:59) */
void
e_marshal_VOID__STRING_POINTER_POINTER (GClosure *closure,
GValue *return_value G_GNUC_UNUSED,
@@ -2416,7 +2457,7 @@ e_marshal_VOID__STRING_POINTER_POINTER (GClosure *closure,
data2);
}
-/* NONE:STRING,STRING (e-marshal.list:59) */
+/* NONE:STRING,STRING (e-marshal.list:60) */
void
e_marshal_VOID__STRING_STRING (GClosure *closure,
GValue *return_value G_GNUC_UNUSED,
@@ -2453,7 +2494,7 @@ e_marshal_VOID__STRING_STRING (GClosure *closure,
data2);
}
-/* NONE:UINT,STRING (e-marshal.list:60) */
+/* NONE:UINT,STRING (e-marshal.list:61) */
void
e_marshal_VOID__UINT_STRING (GClosure *closure,
GValue *return_value G_GNUC_UNUSED,
@@ -2490,7 +2531,7 @@ e_marshal_VOID__UINT_STRING (GClosure *closure,
data2);
}
-/* STRING:NONE (e-marshal.list:61) */
+/* STRING:NONE (e-marshal.list:62) */
void
e_marshal_STRING__VOID (GClosure *closure,
GValue *return_value G_GNUC_UNUSED,
diff --git a/libemail-utils/e-marshal.h b/libemail-utils/e-marshal.h
index ee27315..67be9cc 100644
--- a/libemail-utils/e-marshal.h
+++ b/libemail-utils/e-marshal.h
@@ -79,7 +79,15 @@ extern void e_marshal_BOOLEAN__OBJECT (GClosure *closure,
gpointer invocation_hint,
gpointer marshal_data);
-/* BOOLEAN:OBJECT,DOUBLE,DOUBLE,BOOLEAN (e-marshal.list:10) */
+/* BOOLEAN:OBJECT,OBJECT (e-marshal.list:10) */
+extern void e_marshal_BOOLEAN__OBJECT_OBJECT (GClosure *closure,
+ GValue *return_value,
+ guint n_param_values,
+ const GValue *param_values,
+ gpointer invocation_hint,
+ gpointer marshal_data);
+
+/* BOOLEAN:OBJECT,DOUBLE,DOUBLE,BOOLEAN (e-marshal.list:11) */
extern void e_marshal_BOOLEAN__OBJECT_DOUBLE_DOUBLE_BOOLEAN (GClosure *closure,
GValue *return_value,
guint n_param_values,
@@ -87,7 +95,7 @@ extern void e_marshal_BOOLEAN__OBJECT_DOUBLE_DOUBLE_BOOLEAN (GClosure *closu
gpointer invocation_hint,
gpointer marshal_data);
-/* BOOLEAN:POINTER (e-marshal.list:11) */
+/* BOOLEAN:POINTER (e-marshal.list:12) */
extern void e_marshal_BOOLEAN__POINTER (GClosure *closure,
GValue *return_value,
guint n_param_values,
@@ -95,7 +103,7 @@ extern void e_marshal_BOOLEAN__POINTER (GClosure *closure,
gpointer invocation_hint,
gpointer marshal_data);
-/* BOOLEAN:POINTER,BOOLEAN,POINTER (e-marshal.list:12) */
+/* BOOLEAN:POINTER,BOOLEAN,POINTER (e-marshal.list:13) */
extern void e_marshal_BOOLEAN__POINTER_BOOLEAN_POINTER (GClosure *closure,
GValue *return_value,
guint n_param_values,
@@ -103,7 +111,7 @@ extern void e_marshal_BOOLEAN__POINTER_BOOLEAN_POINTER (GClosure *closure,
gpointer invocation_hint,
gpointer marshal_data);
-/* BOOLEAN:POINTER,POINTER (e-marshal.list:13) */
+/* BOOLEAN:POINTER,POINTER (e-marshal.list:14) */
extern void e_marshal_BOOLEAN__POINTER_POINTER (GClosure *closure,
GValue *return_value,
guint n_param_values,
@@ -111,7 +119,7 @@ extern void e_marshal_BOOLEAN__POINTER_POINTER (GClosure *closure,
gpointer invocation_hint,
gpointer marshal_data);
-/* BOOLEAN:POINTER,POINTER,POINTER,POINTER (e-marshal.list:14) */
+/* BOOLEAN:POINTER,POINTER,POINTER,POINTER (e-marshal.list:15) */
extern void e_marshal_BOOLEAN__POINTER_POINTER_POINTER_POINTER (GClosure *closure,
GValue *return_value,
guint n_param_values,
@@ -119,7 +127,7 @@ extern void e_marshal_BOOLEAN__POINTER_POINTER_POINTER_POINTER (GClosure *cl
gpointer invocation_hint,
gpointer marshal_data);
-/* BOOLEAN:STRING (e-marshal.list:15) */
+/* BOOLEAN:STRING (e-marshal.list:16) */
extern void e_marshal_BOOLEAN__STRING (GClosure *closure,
GValue *return_value,
guint n_param_values,
@@ -127,7 +135,7 @@ extern void e_marshal_BOOLEAN__STRING (GClosure *closure,
gpointer invocation_hint,
gpointer marshal_data);
-/* BOOLEAN:STRING,INT (e-marshal.list:16) */
+/* BOOLEAN:STRING,INT (e-marshal.list:17) */
extern void e_marshal_BOOLEAN__STRING_INT (GClosure *closure,
GValue *return_value,
guint n_param_values,
@@ -135,7 +143,7 @@ extern void e_marshal_BOOLEAN__STRING_INT (GClosure *closure,
gpointer invocation_hint,
gpointer marshal_data);
-/* DOUBLE:OBJECT,DOUBLE,DOUBLE,BOOLEAN (e-marshal.list:17) */
+/* DOUBLE:OBJECT,DOUBLE,DOUBLE,BOOLEAN (e-marshal.list:18) */
extern void e_marshal_DOUBLE__OBJECT_DOUBLE_DOUBLE_BOOLEAN (GClosure *closure,
GValue *return_value,
guint n_param_values,
@@ -143,7 +151,7 @@ extern void e_marshal_DOUBLE__OBJECT_DOUBLE_DOUBLE_BOOLEAN (GClosure *closur
gpointer invocation_hint,
gpointer marshal_data);
-/* INT:BOXED (e-marshal.list:18) */
+/* INT:BOXED (e-marshal.list:19) */
extern void e_marshal_INT__BOXED (GClosure *closure,
GValue *return_value,
guint n_param_values,
@@ -151,7 +159,7 @@ extern void e_marshal_INT__BOXED (GClosure *closure,
gpointer invocation_hint,
gpointer marshal_data);
-/* INT:INT (e-marshal.list:19) */
+/* INT:INT (e-marshal.list:20) */
extern void e_marshal_INT__INT (GClosure *closure,
GValue *return_value,
guint n_param_values,
@@ -159,7 +167,7 @@ extern void e_marshal_INT__INT (GClosure *closure,
gpointer invocation_hint,
gpointer marshal_data);
-/* INT:INT,INT,BOXED (e-marshal.list:20) */
+/* INT:INT,INT,BOXED (e-marshal.list:21) */
extern void e_marshal_INT__INT_INT_BOXED (GClosure *closure,
GValue *return_value,
guint n_param_values,
@@ -167,7 +175,7 @@ extern void e_marshal_INT__INT_INT_BOXED (GClosure *closure,
gpointer invocation_hint,
gpointer marshal_data);
-/* INT:INT,POINTER,INT,BOXED (e-marshal.list:21) */
+/* INT:INT,POINTER,INT,BOXED (e-marshal.list:22) */
extern void e_marshal_INT__INT_POINTER_INT_BOXED (GClosure *closure,
GValue *return_value,
guint n_param_values,
@@ -175,7 +183,7 @@ extern void e_marshal_INT__INT_POINTER_INT_BOXED (GClosure *closure,
gpointer invocation_hint,
gpointer marshal_data);
-/* INT:OBJECT,BOXED (e-marshal.list:22) */
+/* INT:OBJECT,BOXED (e-marshal.list:23) */
extern void e_marshal_INT__OBJECT_BOXED (GClosure *closure,
GValue *return_value,
guint n_param_values,
@@ -183,7 +191,7 @@ extern void e_marshal_INT__OBJECT_BOXED (GClosure *closure,
gpointer invocation_hint,
gpointer marshal_data);
-/* INT:POINTER (e-marshal.list:23) */
+/* INT:POINTER (e-marshal.list:24) */
extern void e_marshal_INT__POINTER (GClosure *closure,
GValue *return_value,
guint n_param_values,
@@ -191,7 +199,7 @@ extern void e_marshal_INT__POINTER (GClosure *closure,
gpointer invocation_hint,
gpointer marshal_data);
-/* NONE:BOXED,INT (e-marshal.list:24) */
+/* NONE:BOXED,INT (e-marshal.list:25) */
extern void e_marshal_VOID__BOXED_INT (GClosure *closure,
GValue *return_value,
guint n_param_values,
@@ -200,7 +208,7 @@ extern void e_marshal_VOID__BOXED_INT (GClosure *closure,
gpointer marshal_data);
#define e_marshal_NONE__BOXED_INT e_marshal_VOID__BOXED_INT
-/* NONE:ENUM,OBJECT,OBJECT (e-marshal.list:25) */
+/* NONE:ENUM,OBJECT,OBJECT (e-marshal.list:26) */
extern void e_marshal_VOID__ENUM_OBJECT_OBJECT (GClosure *closure,
GValue *return_value,
guint n_param_values,
@@ -209,7 +217,7 @@ extern void e_marshal_VOID__ENUM_OBJECT_OBJECT (GClosure *closure,
gpointer marshal_data);
#define e_marshal_NONE__ENUM_OBJECT_OBJECT e_marshal_VOID__ENUM_OBJECT_OBJECT
-/* NONE:INT,INT (e-marshal.list:26) */
+/* NONE:INT,INT (e-marshal.list:27) */
extern void e_marshal_VOID__INT_INT (GClosure *closure,
GValue *return_value,
guint n_param_values,
@@ -218,7 +226,7 @@ extern void e_marshal_VOID__INT_INT (GClosure *closure,
gpointer marshal_data);
#define e_marshal_NONE__INT_INT e_marshal_VOID__INT_INT
-/* NONE:INT,INT,BOXED (e-marshal.list:27) */
+/* NONE:INT,INT,BOXED (e-marshal.list:28) */
extern void e_marshal_VOID__INT_INT_BOXED (GClosure *closure,
GValue *return_value,
guint n_param_values,
@@ -227,7 +235,7 @@ extern void e_marshal_VOID__INT_INT_BOXED (GClosure *closure,
gpointer marshal_data);
#define e_marshal_NONE__INT_INT_BOXED e_marshal_VOID__INT_INT_BOXED
-/* NONE:INT,INT,OBJECT (e-marshal.list:28) */
+/* NONE:INT,INT,OBJECT (e-marshal.list:29) */
extern void e_marshal_VOID__INT_INT_OBJECT (GClosure *closure,
GValue *return_value,
guint n_param_values,
@@ -236,7 +244,7 @@ extern void e_marshal_VOID__INT_INT_OBJECT (GClosure *closure,
gpointer marshal_data);
#define e_marshal_NONE__INT_INT_OBJECT e_marshal_VOID__INT_INT_OBJECT
-/* NONE:INT,INT,OBJECT,BOXED,UINT,UINT (e-marshal.list:29) */
+/* NONE:INT,INT,OBJECT,BOXED,UINT,UINT (e-marshal.list:30) */
extern void e_marshal_VOID__INT_INT_OBJECT_BOXED_UINT_UINT (GClosure *closure,
GValue *return_value,
guint n_param_values,
@@ -245,7 +253,7 @@ extern void e_marshal_VOID__INT_INT_OBJECT_BOXED_UINT_UINT (GClosure *closur
gpointer marshal_data);
#define e_marshal_NONE__INT_INT_OBJECT_BOXED_UINT_UINT e_marshal_VOID__INT_INT_OBJECT_BOXED_UINT_UINT
-/* NONE:INT,INT,OBJECT,INT,INT,BOXED,UINT,UINT (e-marshal.list:30) */
+/* NONE:INT,INT,OBJECT,INT,INT,BOXED,UINT,UINT (e-marshal.list:31) */
extern void e_marshal_VOID__INT_INT_OBJECT_INT_INT_BOXED_UINT_UINT (GClosure *closure,
GValue *return_value,
guint n_param_values,
@@ -254,7 +262,7 @@ extern void e_marshal_VOID__INT_INT_OBJECT_INT_INT_BOXED_UINT_UINT (GClosure
gpointer marshal_data);
#define e_marshal_NONE__INT_INT_OBJECT_INT_INT_BOXED_UINT_UINT e_marshal_VOID__INT_INT_OBJECT_INT_INT_BOXED_UINT_UINT
-/* NONE:INT,INT,OBJECT,UINT (e-marshal.list:31) */
+/* NONE:INT,INT,OBJECT,UINT (e-marshal.list:32) */
extern void e_marshal_VOID__INT_INT_OBJECT_UINT (GClosure *closure,
GValue *return_value,
guint n_param_values,
@@ -263,7 +271,7 @@ extern void e_marshal_VOID__INT_INT_OBJECT_UINT (GClosure *closure,
gpointer marshal_data);
#define e_marshal_NONE__INT_INT_OBJECT_UINT e_marshal_VOID__INT_INT_OBJECT_UINT
-/* NONE:INT,OBJECT (e-marshal.list:32) */
+/* NONE:INT,OBJECT (e-marshal.list:33) */
extern void e_marshal_VOID__INT_OBJECT (GClosure *closure,
GValue *return_value,
guint n_param_values,
@@ -272,7 +280,7 @@ extern void e_marshal_VOID__INT_OBJECT (GClosure *closure,
gpointer marshal_data);
#define e_marshal_NONE__INT_OBJECT e_marshal_VOID__INT_OBJECT
-/* NONE:INT,POINTER (e-marshal.list:33) */
+/* NONE:INT,POINTER (e-marshal.list:34) */
extern void e_marshal_VOID__INT_POINTER (GClosure *closure,
GValue *return_value,
guint n_param_values,
@@ -281,7 +289,7 @@ extern void e_marshal_VOID__INT_POINTER (GClosure *closure,
gpointer marshal_data);
#define e_marshal_NONE__INT_POINTER e_marshal_VOID__INT_POINTER
-/* NONE:INT,POINTER,INT,BOXED (e-marshal.list:34) */
+/* NONE:INT,POINTER,INT,BOXED (e-marshal.list:35) */
extern void e_marshal_VOID__INT_POINTER_INT_BOXED (GClosure *closure,
GValue *return_value,
guint n_param_values,
@@ -290,7 +298,7 @@ extern void e_marshal_VOID__INT_POINTER_INT_BOXED (GClosure *closure,
gpointer marshal_data);
#define e_marshal_NONE__INT_POINTER_INT_BOXED e_marshal_VOID__INT_POINTER_INT_BOXED
-/* NONE:INT,POINTER,INT,OBJECT (e-marshal.list:35) */
+/* NONE:INT,POINTER,INT,OBJECT (e-marshal.list:36) */
extern void e_marshal_VOID__INT_POINTER_INT_OBJECT (GClosure *closure,
GValue *return_value,
guint n_param_values,
@@ -299,7 +307,7 @@ extern void e_marshal_VOID__INT_POINTER_INT_OBJECT (GClosure *closure,
gpointer marshal_data);
#define e_marshal_NONE__INT_POINTER_INT_OBJECT e_marshal_VOID__INT_POINTER_INT_OBJECT
-/* NONE:INT,POINTER,INT,OBJECT,BOXED,UINT,UINT (e-marshal.list:36) */
+/* NONE:INT,POINTER,INT,OBJECT,BOXED,UINT,UINT (e-marshal.list:37) */
extern void e_marshal_VOID__INT_POINTER_INT_OBJECT_BOXED_UINT_UINT (GClosure *closure,
GValue *return_value,
guint n_param_values,
@@ -308,7 +316,7 @@ extern void e_marshal_VOID__INT_POINTER_INT_OBJECT_BOXED_UINT_UINT (GClosure
gpointer marshal_data);
#define e_marshal_NONE__INT_POINTER_INT_OBJECT_BOXED_UINT_UINT e_marshal_VOID__INT_POINTER_INT_OBJECT_BOXED_UINT_UINT
-/* NONE:INT,POINTER,INT,OBJECT,INT,INT,BOXED,UINT,UINT (e-marshal.list:37) */
+/* NONE:INT,POINTER,INT,OBJECT,INT,INT,BOXED,UINT,UINT (e-marshal.list:38) */
extern void e_marshal_VOID__INT_POINTER_INT_OBJECT_INT_INT_BOXED_UINT_UINT (GClosure *closure,
GValue *return_value,
guint n_param_values,
@@ -317,7 +325,7 @@ extern void e_marshal_VOID__INT_POINTER_INT_OBJECT_INT_INT_BOXED_UINT_UINT (GClo
gpointer marshal_data);
#define e_marshal_NONE__INT_POINTER_INT_OBJECT_INT_INT_BOXED_UINT_UINT e_marshal_VOID__INT_POINTER_INT_OBJECT_INT_INT_BOXED_UINT_UINT
-/* NONE:INT,POINTER,INT,OBJECT,UINT (e-marshal.list:38) */
+/* NONE:INT,POINTER,INT,OBJECT,UINT (e-marshal.list:39) */
extern void e_marshal_VOID__INT_POINTER_INT_OBJECT_UINT (GClosure *closure,
GValue *return_value,
guint n_param_values,
@@ -326,7 +334,7 @@ extern void e_marshal_VOID__INT_POINTER_INT_OBJECT_UINT (GClosure *closure,
gpointer marshal_data);
#define e_marshal_NONE__INT_POINTER_INT_OBJECT_UINT e_marshal_VOID__INT_POINTER_INT_OBJECT_UINT
-/* NONE:LONG,LONG (e-marshal.list:39) */
+/* NONE:LONG,LONG (e-marshal.list:40) */
extern void e_marshal_VOID__LONG_LONG (GClosure *closure,
GValue *return_value,
guint n_param_values,
@@ -335,7 +343,7 @@ extern void e_marshal_VOID__LONG_LONG (GClosure *closure,
gpointer marshal_data);
#define e_marshal_NONE__LONG_LONG e_marshal_VOID__LONG_LONG
-/* NONE:OBJECT,BOOLEAN (e-marshal.list:40) */
+/* NONE:OBJECT,BOOLEAN (e-marshal.list:41) */
extern void e_marshal_VOID__OBJECT_BOOLEAN (GClosure *closure,
GValue *return_value,
guint n_param_values,
@@ -344,7 +352,7 @@ extern void e_marshal_VOID__OBJECT_BOOLEAN (GClosure *closure,
gpointer marshal_data);
#define e_marshal_NONE__OBJECT_BOOLEAN e_marshal_VOID__OBJECT_BOOLEAN
-/* NONE:OBJECT,DOUBLE,DOUBLE,BOOLEAN (e-marshal.list:41) */
+/* NONE:OBJECT,DOUBLE,DOUBLE,BOOLEAN (e-marshal.list:42) */
extern void e_marshal_VOID__OBJECT_DOUBLE_DOUBLE_BOOLEAN (GClosure *closure,
GValue *return_value,
guint n_param_values,
@@ -353,7 +361,7 @@ extern void e_marshal_VOID__OBJECT_DOUBLE_DOUBLE_BOOLEAN (GClosure *closure,
gpointer marshal_data);
#define e_marshal_NONE__OBJECT_DOUBLE_DOUBLE_BOOLEAN e_marshal_VOID__OBJECT_DOUBLE_DOUBLE_BOOLEAN
-/* NONE:OBJECT,OBJECT (e-marshal.list:42) */
+/* NONE:OBJECT,OBJECT (e-marshal.list:43) */
extern void e_marshal_VOID__OBJECT_OBJECT (GClosure *closure,
GValue *return_value,
guint n_param_values,
@@ -362,7 +370,7 @@ extern void e_marshal_VOID__OBJECT_OBJECT (GClosure *closure,
gpointer marshal_data);
#define e_marshal_NONE__OBJECT_OBJECT e_marshal_VOID__OBJECT_OBJECT
-/* NONE:OBJECT,STRING (e-marshal.list:43) */
+/* NONE:OBJECT,STRING (e-marshal.list:44) */
extern void e_marshal_VOID__OBJECT_STRING (GClosure *closure,
GValue *return_value,
guint n_param_values,
@@ -371,7 +379,7 @@ extern void e_marshal_VOID__OBJECT_STRING (GClosure *closure,
gpointer marshal_data);
#define e_marshal_NONE__OBJECT_STRING e_marshal_VOID__OBJECT_STRING
-/* NONE:OBJECT,STRING,INT (e-marshal.list:44) */
+/* NONE:OBJECT,STRING,INT (e-marshal.list:45) */
extern void e_marshal_VOID__OBJECT_STRING_INT (GClosure *closure,
GValue *return_value,
guint n_param_values,
@@ -380,7 +388,7 @@ extern void e_marshal_VOID__OBJECT_STRING_INT (GClosure *closure,
gpointer marshal_data);
#define e_marshal_NONE__OBJECT_STRING_INT e_marshal_VOID__OBJECT_STRING_INT
-/* NONE:OBJECT,STRING,INT,STRING,STRING,STRING (e-marshal.list:45) */
+/* NONE:OBJECT,STRING,INT,STRING,STRING,STRING (e-marshal.list:46) */
extern void e_marshal_VOID__OBJECT_STRING_INT_STRING_STRING_STRING (GClosure *closure,
GValue *return_value,
guint n_param_values,
@@ -389,7 +397,7 @@ extern void e_marshal_VOID__OBJECT_STRING_INT_STRING_STRING_STRING (GClosure
gpointer marshal_data);
#define e_marshal_NONE__OBJECT_STRING_INT_STRING_STRING_STRING e_marshal_VOID__OBJECT_STRING_INT_STRING_STRING_STRING
-/* NONE:OBJECT,STRING,STRING (e-marshal.list:46) */
+/* NONE:OBJECT,STRING,STRING (e-marshal.list:47) */
extern void e_marshal_VOID__OBJECT_STRING_STRING (GClosure *closure,
GValue *return_value,
guint n_param_values,
@@ -398,7 +406,7 @@ extern void e_marshal_VOID__OBJECT_STRING_STRING (GClosure *closure,
gpointer marshal_data);
#define e_marshal_NONE__OBJECT_STRING_STRING e_marshal_VOID__OBJECT_STRING_STRING
-/* NONE:OBJECT,STRING,UINT (e-marshal.list:47) */
+/* NONE:OBJECT,STRING,UINT (e-marshal.list:48) */
extern void e_marshal_VOID__OBJECT_STRING_UINT (GClosure *closure,
GValue *return_value,
guint n_param_values,
@@ -407,7 +415,7 @@ extern void e_marshal_VOID__OBJECT_STRING_UINT (GClosure *closure,
gpointer marshal_data);
#define e_marshal_NONE__OBJECT_STRING_UINT e_marshal_VOID__OBJECT_STRING_UINT
-/* NONE:POINTER,INT (e-marshal.list:48) */
+/* NONE:POINTER,INT (e-marshal.list:49) */
extern void e_marshal_VOID__POINTER_INT (GClosure *closure,
GValue *return_value,
guint n_param_values,
@@ -416,7 +424,7 @@ extern void e_marshal_VOID__POINTER_INT (GClosure *closure,
gpointer marshal_data);
#define e_marshal_NONE__POINTER_INT e_marshal_VOID__POINTER_INT
-/* NONE:POINTER,INT,INT,INT,INT (e-marshal.list:49) */
+/* NONE:POINTER,INT,INT,INT,INT (e-marshal.list:50) */
extern void e_marshal_VOID__POINTER_INT_INT_INT_INT (GClosure *closure,
GValue *return_value,
guint n_param_values,
@@ -425,7 +433,7 @@ extern void e_marshal_VOID__POINTER_INT_INT_INT_INT (GClosure *closure,
gpointer marshal_data);
#define e_marshal_NONE__POINTER_INT_INT_INT_INT e_marshal_VOID__POINTER_INT_INT_INT_INT
-/* NONE:POINTER,INT,OBJECT (e-marshal.list:50) */
+/* NONE:POINTER,INT,OBJECT (e-marshal.list:51) */
extern void e_marshal_VOID__POINTER_INT_OBJECT (GClosure *closure,
GValue *return_value,
guint n_param_values,
@@ -434,7 +442,7 @@ extern void e_marshal_VOID__POINTER_INT_OBJECT (GClosure *closure,
gpointer marshal_data);
#define e_marshal_NONE__POINTER_INT_OBJECT e_marshal_VOID__POINTER_INT_OBJECT
-/* NONE:POINTER,OBJECT (e-marshal.list:51) */
+/* NONE:POINTER,OBJECT (e-marshal.list:52) */
extern void e_marshal_VOID__POINTER_OBJECT (GClosure *closure,
GValue *return_value,
guint n_param_values,
@@ -443,7 +451,7 @@ extern void e_marshal_VOID__POINTER_OBJECT (GClosure *closure,
gpointer marshal_data);
#define e_marshal_NONE__POINTER_OBJECT e_marshal_VOID__POINTER_OBJECT
-/* NONE:POINTER,POINTER (e-marshal.list:52) */
+/* NONE:POINTER,POINTER (e-marshal.list:53) */
extern void e_marshal_VOID__POINTER_POINTER (GClosure *closure,
GValue *return_value,
guint n_param_values,
@@ -452,7 +460,7 @@ extern void e_marshal_VOID__POINTER_POINTER (GClosure *closure,
gpointer marshal_data);
#define e_marshal_NONE__POINTER_POINTER e_marshal_VOID__POINTER_POINTER
-/* NONE:POINTER,POINTER,INT (e-marshal.list:53) */
+/* NONE:POINTER,POINTER,INT (e-marshal.list:54) */
extern void e_marshal_VOID__POINTER_POINTER_INT (GClosure *closure,
GValue *return_value,
guint n_param_values,
@@ -461,7 +469,7 @@ extern void e_marshal_VOID__POINTER_POINTER_INT (GClosure *closure,
gpointer marshal_data);
#define e_marshal_NONE__POINTER_POINTER_INT e_marshal_VOID__POINTER_POINTER_INT
-/* NONE:STRING,DOUBLE (e-marshal.list:54) */
+/* NONE:STRING,DOUBLE (e-marshal.list:55) */
extern void e_marshal_VOID__STRING_DOUBLE (GClosure *closure,
GValue *return_value,
guint n_param_values,
@@ -470,7 +478,7 @@ extern void e_marshal_VOID__STRING_DOUBLE (GClosure *closure,
gpointer marshal_data);
#define e_marshal_NONE__STRING_DOUBLE e_marshal_VOID__STRING_DOUBLE
-/* NONE:STRING,INT (e-marshal.list:55) */
+/* NONE:STRING,INT (e-marshal.list:56) */
extern void e_marshal_VOID__STRING_INT (GClosure *closure,
GValue *return_value,
guint n_param_values,
@@ -479,7 +487,7 @@ extern void e_marshal_VOID__STRING_INT (GClosure *closure,
gpointer marshal_data);
#define e_marshal_NONE__STRING_INT e_marshal_VOID__STRING_INT
-/* NONE:STRING,INT,INT (e-marshal.list:56) */
+/* NONE:STRING,INT,INT (e-marshal.list:57) */
extern void e_marshal_VOID__STRING_INT_INT (GClosure *closure,
GValue *return_value,
guint n_param_values,
@@ -488,7 +496,7 @@ extern void e_marshal_VOID__STRING_INT_INT (GClosure *closure,
gpointer marshal_data);
#define e_marshal_NONE__STRING_INT_INT e_marshal_VOID__STRING_INT_INT
-/* NONE:STRING,OBJECT (e-marshal.list:57) */
+/* NONE:STRING,OBJECT (e-marshal.list:58) */
extern void e_marshal_VOID__STRING_OBJECT (GClosure *closure,
GValue *return_value,
guint n_param_values,
@@ -497,7 +505,7 @@ extern void e_marshal_VOID__STRING_OBJECT (GClosure *closure,
gpointer marshal_data);
#define e_marshal_NONE__STRING_OBJECT e_marshal_VOID__STRING_OBJECT
-/* NONE:STRING,POINTER,POINTER (e-marshal.list:58) */
+/* NONE:STRING,POINTER,POINTER (e-marshal.list:59) */
extern void e_marshal_VOID__STRING_POINTER_POINTER (GClosure *closure,
GValue *return_value,
guint n_param_values,
@@ -506,7 +514,7 @@ extern void e_marshal_VOID__STRING_POINTER_POINTER (GClosure *closure,
gpointer marshal_data);
#define e_marshal_NONE__STRING_POINTER_POINTER e_marshal_VOID__STRING_POINTER_POINTER
-/* NONE:STRING,STRING (e-marshal.list:59) */
+/* NONE:STRING,STRING (e-marshal.list:60) */
extern void e_marshal_VOID__STRING_STRING (GClosure *closure,
GValue *return_value,
guint n_param_values,
@@ -515,7 +523,7 @@ extern void e_marshal_VOID__STRING_STRING (GClosure *closure,
gpointer marshal_data);
#define e_marshal_NONE__STRING_STRING e_marshal_VOID__STRING_STRING
-/* NONE:UINT,STRING (e-marshal.list:60) */
+/* NONE:UINT,STRING (e-marshal.list:61) */
extern void e_marshal_VOID__UINT_STRING (GClosure *closure,
GValue *return_value,
guint n_param_values,
@@ -524,7 +532,7 @@ extern void e_marshal_VOID__UINT_STRING (GClosure *closure,
gpointer marshal_data);
#define e_marshal_NONE__UINT_STRING e_marshal_VOID__UINT_STRING
-/* STRING:NONE (e-marshal.list:61) */
+/* STRING:NONE (e-marshal.list:62) */
extern void e_marshal_STRING__VOID (GClosure *closure,
GValue *return_value,
guint n_param_values,
diff --git a/mail/e-mail-ui-session.c b/mail/e-mail-ui-session.c
index 2ecbef7..71259da 100644
--- a/mail/e-mail-ui-session.c
+++ b/mail/e-mail-ui-session.c
@@ -645,6 +645,12 @@ mail_session_get_property (GObject *object,
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
}
+typedef struct _SourceContext SourceContext;
+struct _SourceContext {
+ EMailSession *session;
+ CamelService *service;
+};
+
static gboolean
mail_ui_session_add_service_cb (SourceContext *context)
{
@@ -656,6 +662,18 @@ mail_ui_session_add_service_cb (SourceContext *context)
return FALSE;
}
+static void
+source_context_free (SourceContext *context)
+{
+ if (context->session != NULL)
+ g_object_unref (context->session);
+
+ if (context->service != NULL)
+ g_object_unref (context->service);
+
+ g_slice_free (SourceContext, context);
+}
+
static CamelService *
mail_session_add_service (CamelSession *session,
const gchar *uid,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
