[evolution-data-server] camel: Use g_cclosure_marshal_generic() for all signals.
- From: Matthew Barnes <mbarnes src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution-data-server] camel: Use g_cclosure_marshal_generic() for all signals.
- Date: Sun, 17 Mar 2013 13:42:04 +0000 (UTC)
commit 4797ab274d98783e185bad3bc34e40e1498bf774
Author: Matthew Barnes <mbarnes redhat com>
Date: Sat Mar 2 23:40:44 2013 -0500
camel: Use g_cclosure_marshal_generic() for all signals.
g_signal_new() defaults to the generic marshaller when NULL is given
for the 'c_marshaller' parameter. The generic marshaller uses libffi
to figure out the argument types for itself.
Also remove camel-marshal.list, as it is no longer needed.
camel/Makefile.am | 8 +-------
camel/camel-folder.c | 9 +++------
camel/camel-imapx-server.c | 6 ++----
camel/camel-marshal.list | 3 ---
camel/camel-operation.c | 4 +---
camel/camel-session.c | 7 ++-----
camel/camel-store.c | 13 ++++---------
camel/camel-subscribable.c | 6 ++----
docs/reference/camel/Makefile.am | 1 -
9 files changed, 15 insertions(+), 42 deletions(-)
---
diff --git a/camel/Makefile.am b/camel/Makefile.am
index db212b3..7d3a4d1 100644
--- a/camel/Makefile.am
+++ b/camel/Makefile.am
@@ -12,9 +12,6 @@ LIBCAMEL_PLATFORM_DEP_SOURCES = \
LOCK_HELPER = camel-lock-helper-1.2
endif
-MARSHAL_GENERATED = camel-marshal.c camel-marshal.h
- EVO_MARSHAL_RULE@
-
%-$(API_VERSION).pc: %.pc
cp $< $@
@@ -59,7 +56,6 @@ libcamel_1_2_la_CPPFLAGS = \
libcamel_1_2_la_SOURCES = \
$(ENUM_GENERATED) \
- $(MARSHAL_GENERATED) \
camel-address.c \
camel-block-file.c \
camel-certdb.c \
@@ -419,15 +415,13 @@ noinst_HEADERS = \
BUILT_SOURCES = \
camel-mime-tables.c \
- $(ENUM_GENERATED) \
- $(MARSHAL_GENERATED)
+ $(ENUM_GENERATED)
EXTRA_DIST = \
$(pkgconfig_in_files) \
camel-enumtypes.h.template \
camel-enumtypes.c.template \
camel-imapx-tokens.txt \
- camel-marshal.list \
gentables.pl \
README
diff --git a/camel/camel-folder.c b/camel/camel-folder.c
index ce257c6..ad40108 100644
--- a/camel/camel-folder.c
+++ b/camel/camel-folder.c
@@ -1897,8 +1897,7 @@ camel_folder_class_init (CamelFolderClass *class)
G_OBJECT_CLASS_TYPE (class),
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (CamelFolderClass, changed),
- NULL, NULL,
- g_cclosure_marshal_VOID__POINTER,
+ NULL, NULL, NULL,
G_TYPE_NONE, 1,
G_TYPE_POINTER);
@@ -1911,8 +1910,7 @@ camel_folder_class_init (CamelFolderClass *class)
G_OBJECT_CLASS_TYPE (class),
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (CamelFolderClass, deleted),
- NULL, NULL,
- g_cclosure_marshal_VOID__VOID,
+ NULL, NULL, NULL,
G_TYPE_NONE, 0);
/**
@@ -1925,8 +1923,7 @@ camel_folder_class_init (CamelFolderClass *class)
G_OBJECT_CLASS_TYPE (class),
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (CamelFolderClass, renamed),
- NULL, NULL,
- g_cclosure_marshal_VOID__STRING,
+ NULL, NULL, NULL,
G_TYPE_NONE, 1,
G_TYPE_STRING);
}
diff --git a/camel/camel-imapx-server.c b/camel/camel-imapx-server.c
index 6d0893f..a8c7f03 100644
--- a/camel/camel-imapx-server.c
+++ b/camel/camel-imapx-server.c
@@ -7209,8 +7209,7 @@ camel_imapx_server_class_init (CamelIMAPXServerClass *class)
G_OBJECT_CLASS_TYPE (class),
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (CamelIMAPXServerClass, select_changed),
- NULL, NULL,
- g_cclosure_marshal_VOID__STRING,
+ NULL, NULL, NULL,
G_TYPE_NONE, 1, G_TYPE_STRING);
/**
@@ -7222,8 +7221,7 @@ camel_imapx_server_class_init (CamelIMAPXServerClass *class)
G_OBJECT_CLASS_TYPE (class),
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (CamelIMAPXServerClass, shutdown),
- NULL, NULL,
- g_cclosure_marshal_VOID__VOID,
+ NULL, NULL, NULL,
G_TYPE_NONE, 0);
class->tagprefix = 'A';
diff --git a/camel/camel-operation.c b/camel/camel-operation.c
index 8646627..968fd89 100644
--- a/camel/camel-operation.c
+++ b/camel/camel-operation.c
@@ -25,7 +25,6 @@
#include <nspr.h>
-#include "camel-marshal.h"
#include "camel-msgport.h"
#include "camel-operation.h"
@@ -172,8 +171,7 @@ camel_operation_class_init (CamelOperationClass *class)
G_TYPE_FROM_CLASS (class),
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (CamelOperationClass, status),
- NULL, NULL,
- camel_marshal_VOID__STRING_INT,
+ NULL, NULL, NULL,
G_TYPE_NONE, 2,
G_TYPE_STRING,
G_TYPE_INT);
diff --git a/camel/camel-session.c b/camel/camel-session.c
index 8d75099..0ab9081 100644
--- a/camel/camel-session.c
+++ b/camel/camel-session.c
@@ -40,7 +40,6 @@
#include "camel-debug.h"
#include "camel-file-utils.h"
#include "camel-folder.h"
-#include "camel-marshal.h"
#include "camel-mime-message.h"
#include "camel-sasl.h"
#include "camel-session.h"
@@ -831,8 +830,7 @@ camel_session_class_init (CamelSessionClass *class)
G_OBJECT_CLASS_TYPE (class),
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (CamelSessionClass, job_started),
- NULL, NULL,
- g_cclosure_marshal_VOID__OBJECT,
+ NULL, NULL, NULL,
G_TYPE_NONE, 1,
G_TYPE_CANCELLABLE);
@@ -841,8 +839,7 @@ camel_session_class_init (CamelSessionClass *class)
G_OBJECT_CLASS_TYPE (class),
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (CamelSessionClass, job_finished),
- NULL, NULL,
- camel_marshal_VOID__OBJECT_POINTER,
+ NULL, NULL, NULL,
G_TYPE_NONE, 2,
G_TYPE_CANCELLABLE,
G_TYPE_POINTER);
diff --git a/camel/camel-store.c b/camel/camel-store.c
index d1ea138..14224c4 100644
--- a/camel/camel-store.c
+++ b/camel/camel-store.c
@@ -37,7 +37,6 @@
#include "camel-db.h"
#include "camel-debug.h"
#include "camel-folder.h"
-#include "camel-marshal.h"
#include "camel-session.h"
#include "camel-store.h"
#include "camel-store-settings.h"
@@ -1206,8 +1205,7 @@ camel_store_class_init (CamelStoreClass *class)
G_OBJECT_CLASS_TYPE (class),
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (CamelStoreClass, folder_created),
- NULL, NULL,
- g_cclosure_marshal_VOID__POINTER,
+ NULL, NULL, NULL,
G_TYPE_NONE, 1,
G_TYPE_POINTER);
@@ -1216,8 +1214,7 @@ camel_store_class_init (CamelStoreClass *class)
G_OBJECT_CLASS_TYPE (class),
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (CamelStoreClass, folder_deleted),
- NULL, NULL,
- g_cclosure_marshal_VOID__POINTER,
+ NULL, NULL, NULL,
G_TYPE_NONE, 1,
G_TYPE_POINTER);
@@ -1226,8 +1223,7 @@ camel_store_class_init (CamelStoreClass *class)
G_OBJECT_CLASS_TYPE (class),
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (CamelStoreClass, folder_opened),
- NULL, NULL,
- g_cclosure_marshal_VOID__OBJECT,
+ NULL, NULL, NULL,
G_TYPE_NONE, 1,
CAMEL_TYPE_FOLDER);
@@ -1236,8 +1232,7 @@ camel_store_class_init (CamelStoreClass *class)
G_OBJECT_CLASS_TYPE (class),
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (CamelStoreClass, folder_renamed),
- NULL, NULL,
- camel_marshal_VOID__STRING_POINTER,
+ NULL, NULL, NULL,
G_TYPE_NONE, 2,
G_TYPE_STRING,
G_TYPE_POINTER);
diff --git a/camel/camel-subscribable.c b/camel/camel-subscribable.c
index e19dc2b..9675e15 100644
--- a/camel/camel-subscribable.c
+++ b/camel/camel-subscribable.c
@@ -293,8 +293,7 @@ camel_subscribable_default_init (CamelSubscribableInterface *interface)
G_STRUCT_OFFSET (
CamelSubscribableInterface,
folder_subscribed),
- NULL, NULL,
- g_cclosure_marshal_VOID__POINTER,
+ NULL, NULL, NULL,
G_TYPE_NONE, 1,
G_TYPE_POINTER);
@@ -305,8 +304,7 @@ camel_subscribable_default_init (CamelSubscribableInterface *interface)
G_STRUCT_OFFSET (
CamelSubscribableInterface,
folder_unsubscribed),
- NULL, NULL,
- g_cclosure_marshal_VOID__POINTER,
+ NULL, NULL, NULL,
G_TYPE_NONE, 1,
G_TYPE_POINTER);
}
diff --git a/docs/reference/camel/Makefile.am b/docs/reference/camel/Makefile.am
index 076fe31..6b12161 100644
--- a/docs/reference/camel/Makefile.am
+++ b/docs/reference/camel/Makefile.am
@@ -50,7 +50,6 @@ IGNORE_HFILES = \
camel-imapx-tokenise.h \
camel-imapx-utils.h \
camel-local-private.h \
- camel-marshal.h \
camel-net-utils-win32.h \
camel-nntp-private.h \
camel-nntp-types.h \
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
