[evolution-data-server] libedataserver: 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] libedataserver: Use g_cclosure_marshal_generic() for all signals.
- Date: Sun, 17 Mar 2013 13:42:24 +0000 (UTC)
commit 26b3dd2e8921796839391d99eab98f195765b0fe
Author: Matthew Barnes <mbarnes redhat com>
Date: Sat Mar 2 23:38:42 2013 -0500
libedataserver: 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 e-marshal.list and e-gdbus-marshallers.list, as they are
no longer needed.
docs/reference/libedataserver/Makefile.am | 2 --
libebackend/e-collection-backend.c | 6 ++----
libebackend/e-data-factory.c | 3 +--
libebackend/e-dbus-server.c | 9 +++------
libebackend/e-offline-listener.c | 3 +--
libebackend/e-source-registry-server.c | 14 ++++----------
libebackend/e-user-prompter-server.c | 2 --
libedataserver/Makefile.am | 13 +------------
libedataserver/e-categories.c | 3 +--
libedataserver/e-client.c | 18 +++++++-----------
libedataserver/e-gdbus-marshallers.list | 14 --------------
libedataserver/e-gdbus-templates.h | 17 +++++++----------
libedataserver/e-iterator.c | 3 +--
libedataserver/e-marshal.list | 2 --
libedataserver/e-proxy.c | 3 +--
libedataserver/e-source-registry.c | 16 +++++-----------
libedataserver/e-source.c | 3 +--
libedataserver/libedataserver.h | 1 -
18 files changed, 35 insertions(+), 97 deletions(-)
---
diff --git a/docs/reference/libedataserver/Makefile.am b/docs/reference/libedataserver/Makefile.am
index 02e80f6..c3c0e63 100644
--- a/docs/reference/libedataserver/Makefile.am
+++ b/docs/reference/libedataserver/Makefile.am
@@ -19,8 +19,6 @@ CFILE_GLOB = $(top_srcdir)/libedataserver/*.c
IGNORE_HFILES = \
e-client-private.h \
- e-marshal.h \
- e-gdbus-marshallers.h \
e-gdbus-templates.h \
e-source-enumtypes.h \
libedataserver-private.h
diff --git a/libebackend/e-collection-backend.c b/libebackend/e-collection-backend.c
index 4b73e55..d73c8b5 100644
--- a/libebackend/e-collection-backend.c
+++ b/libebackend/e-collection-backend.c
@@ -936,8 +936,7 @@ e_collection_backend_class_init (ECollectionBackendClass *class)
G_OBJECT_CLASS_TYPE (object_class),
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (ECollectionBackendClass, child_added),
- NULL, NULL,
- g_cclosure_marshal_VOID__OBJECT,
+ NULL, NULL, NULL,
G_TYPE_NONE, 1,
E_TYPE_SERVER_SIDE_SOURCE);
@@ -959,8 +958,7 @@ e_collection_backend_class_init (ECollectionBackendClass *class)
G_OBJECT_CLASS_TYPE (object_class),
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (ECollectionBackendClass, child_removed),
- NULL, NULL,
- g_cclosure_marshal_VOID__OBJECT,
+ NULL, NULL, NULL,
G_TYPE_NONE, 1,
E_TYPE_SERVER_SIDE_SOURCE);
}
diff --git a/libebackend/e-data-factory.c b/libebackend/e-data-factory.c
index d98df68..4f1c92e 100644
--- a/libebackend/e-data-factory.c
+++ b/libebackend/e-data-factory.c
@@ -191,8 +191,7 @@ e_data_factory_class_init (EDataFactoryClass *class)
G_OBJECT_CLASS_TYPE (object_class),
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (EDataFactoryClass, backend_created),
- NULL, NULL,
- g_cclosure_marshal_VOID__OBJECT,
+ NULL, NULL, NULL,
G_TYPE_NONE, 1,
E_TYPE_BACKEND);
}
diff --git a/libebackend/e-dbus-server.c b/libebackend/e-dbus-server.c
index c97800f..d7c8ff5 100644
--- a/libebackend/e-dbus-server.c
+++ b/libebackend/e-dbus-server.c
@@ -283,8 +283,7 @@ e_dbus_server_class_init (EDBusServerClass *class)
G_OBJECT_CLASS_TYPE (object_class),
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (EDBusServerClass, bus_acquired),
- NULL, NULL,
- g_cclosure_marshal_VOID__OBJECT,
+ NULL, NULL, NULL,
G_TYPE_NONE, 1,
G_TYPE_DBUS_CONNECTION);
@@ -300,8 +299,7 @@ e_dbus_server_class_init (EDBusServerClass *class)
G_OBJECT_CLASS_TYPE (object_class),
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (EDBusServerClass, bus_name_acquired),
- NULL, NULL,
- g_cclosure_marshal_VOID__OBJECT,
+ NULL, NULL, NULL,
G_TYPE_NONE, 1,
G_TYPE_DBUS_CONNECTION);
@@ -319,8 +317,7 @@ e_dbus_server_class_init (EDBusServerClass *class)
G_OBJECT_CLASS_TYPE (object_class),
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (EDBusServerClass, bus_name_lost),
- NULL, NULL,
- g_cclosure_marshal_VOID__OBJECT,
+ NULL, NULL, NULL,
G_TYPE_NONE, 1,
G_TYPE_DBUS_CONNECTION);
diff --git a/libebackend/e-offline-listener.c b/libebackend/e-offline-listener.c
index bee26f7..c2d2c9f 100644
--- a/libebackend/e-offline-listener.c
+++ b/libebackend/e-offline-listener.c
@@ -65,8 +65,7 @@ e_offline_listener_class_init (EOfflineListenerClass *class)
G_OBJECT_CLASS_TYPE (object_class),
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (EOfflineListenerClass, changed),
- NULL, NULL,
- g_cclosure_marshal_VOID__VOID,
+ NULL, NULL, NULL,
G_TYPE_NONE, 0);
}
diff --git a/libebackend/e-source-registry-server.c b/libebackend/e-source-registry-server.c
index 0caa0cc..955a541 100644
--- a/libebackend/e-source-registry-server.c
+++ b/libebackend/e-source-registry-server.c
@@ -43,8 +43,6 @@
#include <e-dbus-source.h>
#include <e-dbus-source-manager.h>
-#include <libedataserver/e-marshal.h>
-
#include <libebackend/e-authentication-mediator.h>
#include <libebackend/e-authentication-session.h>
#include <libebackend/e-server-side-source.h>
@@ -1294,8 +1292,7 @@ e_source_registry_server_class_init (ESourceRegistryServerClass *class)
G_OBJECT_CLASS_TYPE (object_class),
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (ESourceRegistryServerClass, load_error),
- NULL, NULL,
- e_marshal_VOID__OBJECT_BOXED,
+ NULL, NULL, NULL,
G_TYPE_NONE, 2,
G_TYPE_FILE,
G_TYPE_ERROR | G_SIGNAL_TYPE_STATIC_SCOPE);
@@ -1313,8 +1310,7 @@ e_source_registry_server_class_init (ESourceRegistryServerClass *class)
G_OBJECT_CLASS_TYPE (object_class),
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (ESourceRegistryServerClass, files_loaded),
- NULL, NULL,
- g_cclosure_marshal_VOID__VOID,
+ NULL, NULL, NULL,
G_TYPE_NONE, 0);
/**
@@ -1329,8 +1325,7 @@ e_source_registry_server_class_init (ESourceRegistryServerClass *class)
G_OBJECT_CLASS_TYPE (object_class),
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (ESourceRegistryServerClass, source_added),
- NULL, NULL,
- g_cclosure_marshal_VOID__OBJECT,
+ NULL, NULL, NULL,
G_TYPE_NONE, 1,
E_TYPE_SERVER_SIDE_SOURCE);
@@ -1346,8 +1341,7 @@ e_source_registry_server_class_init (ESourceRegistryServerClass *class)
G_OBJECT_CLASS_TYPE (object_class),
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (ESourceRegistryServerClass, source_removed),
- NULL, NULL,
- g_cclosure_marshal_VOID__OBJECT,
+ NULL, NULL, NULL,
G_TYPE_NONE, 1,
E_TYPE_SERVER_SIDE_SOURCE);
diff --git a/libebackend/e-user-prompter-server.c b/libebackend/e-user-prompter-server.c
index 65ab1ae..9b3b2e2 100644
--- a/libebackend/e-user-prompter-server.c
+++ b/libebackend/e-user-prompter-server.c
@@ -36,8 +36,6 @@
/* Private D-Bus classes. */
#include "e-dbus-user-prompter.h"
-#include "libedataserver/e-marshal.h"
-
#include "e-user-prompter-server.h"
#define E_USER_PROMPTER_SERVER_GET_PRIVATE(obj) \
diff --git a/libedataserver/Makefile.am b/libedataserver/Makefile.am
index 2d3b5dd..671571d 100644
--- a/libedataserver/Makefile.am
+++ b/libedataserver/Makefile.am
@@ -8,17 +8,7 @@ e-source-enumtypes.c: e-source-enumtypes.c.template $(ENUM_TYPES)
ENUM_GENERATED = e-source-enumtypes.h e-source-enumtypes.c
-# The marshallers
-MARSHAL_GENERATED = \
- e-gdbus-marshallers.c \
- e-gdbus-marshallers.h \
- e-marshal.c \
- e-marshal.h
- EVO_MARSHAL_RULE@
-
-BUILT_SOURCES = \
- $(ENUM_GENERATED) \
- $(MARSHAL_GENERATED)
+BUILT_SOURCES = $(ENUM_GENERATED)
lib_LTLIBRARIES = libedataserver-1.2.la
@@ -123,7 +113,6 @@ libedataserverinclude_HEADERS = \
e-client.h \
e-credentials.h \
e-flag.h \
- e-gdbus-marshallers.h \
e-gdbus-templates.h \
e-iterator.h \
e-list.h \
diff --git a/libedataserver/e-categories.c b/libedataserver/e-categories.c
index 27e9e64..db74763 100644
--- a/libedataserver/e-categories.c
+++ b/libedataserver/e-categories.c
@@ -101,8 +101,7 @@ e_changed_listener_class_init (EChangedListenerClass *class)
G_TYPE_FROM_CLASS (class),
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (EChangedListenerClass, changed),
- NULL, NULL,
- g_cclosure_marshal_VOID__VOID,
+ NULL, NULL, NULL,
G_TYPE_NONE, 0);
}
diff --git a/libedataserver/e-client.c b/libedataserver/e-client.c
index b0b2959..4308f08 100644
--- a/libedataserver/e-client.c
+++ b/libedataserver/e-client.c
@@ -36,8 +36,6 @@
#include <libedataserver/e-data-server-util.h>
-#include "e-gdbus-marshallers.h"
-
#include "e-client.h"
#include "e-client-private.h"
@@ -861,8 +859,7 @@ e_client_class_init (EClientClass *class)
G_SIGNAL_RUN_LAST |
G_SIGNAL_DEPRECATED,
G_STRUCT_OFFSET (EClientClass, opened),
- NULL, NULL,
- g_cclosure_marshal_VOID__BOXED,
+ NULL, NULL, NULL,
G_TYPE_NONE, 1,
G_TYPE_ERROR);
@@ -871,8 +868,7 @@ e_client_class_init (EClientClass *class)
G_OBJECT_CLASS_TYPE (class),
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (EClientClass, backend_error),
- NULL, NULL,
- g_cclosure_marshal_VOID__STRING,
+ NULL, NULL, NULL,
G_TYPE_NONE, 1,
G_TYPE_STRING);
@@ -881,8 +877,7 @@ e_client_class_init (EClientClass *class)
G_OBJECT_CLASS_TYPE (class),
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (EClientClass, backend_died),
- NULL, NULL,
- g_cclosure_marshal_VOID__VOID,
+ NULL, NULL, NULL,
G_TYPE_NONE, 0);
signals[BACKEND_PROPERTY_CHANGED] = g_signal_new (
@@ -890,9 +885,10 @@ e_client_class_init (EClientClass *class)
G_OBJECT_CLASS_TYPE (class),
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (EClientClass, backend_property_changed),
- NULL, NULL,
- e_gdbus_marshallers_VOID__STRING_STRING,
- G_TYPE_NONE, 2, G_TYPE_STRING, G_TYPE_STRING);
+ NULL, NULL, NULL,
+ G_TYPE_NONE, 2,
+ G_TYPE_STRING,
+ G_TYPE_STRING);
}
static void
diff --git a/libedataserver/e-gdbus-templates.h b/libedataserver/e-gdbus-templates.h
index c7e31cd..23e5321 100644
--- a/libedataserver/e-gdbus-templates.h
+++ b/libedataserver/e-gdbus-templates.h
@@ -32,7 +32,6 @@
#define E_GDBUS_TEMPLATES_H
#include <gio/gio.h>
-#include <libedataserver/e-gdbus-marshallers.h>
G_BEGIN_DECLS
@@ -347,7 +346,7 @@ enum {
G_STRUCT_OFFSET (_iface_struct, _sig_name_var),
\
NULL,
\
NULL,
\
- g_cclosure_marshal_VOID__VOID,
\
+ NULL,
\
G_TYPE_NONE,
\
0);
\
\
@@ -362,7 +361,7 @@ enum {
G_STRUCT_OFFSET (_iface_struct, _sig_name_var),
\
NULL,
\
NULL,
\
- g_cclosure_marshal_VOID__ ## _mtype,
\
+ NULL,
\
G_TYPE_NONE,
\
1,
\
G_TYPE_ ## _gtype);
\
@@ -390,7 +389,7 @@ enum {
G_STRUCT_OFFSET (_iface_struct, _sig_name_var),
\
NULL,
\
NULL,
\
- e_gdbus_marshallers_VOID__UINT_STRING,
\
+ NULL,
\
G_TYPE_NONE,
\
2,
\
G_TYPE_UINT, G_TYPE_STRING);
\
@@ -406,7 +405,7 @@ enum {
G_STRUCT_OFFSET (_iface_struct, _sig_name_var ## _done),
\
NULL,
\
NULL,
\
- e_gdbus_marshallers_VOID__UINT_BOXED,
\
+ NULL,
\
G_TYPE_NONE,
\
2,
\
G_TYPE_UINT, G_TYPE_ERROR);
\
@@ -422,7 +421,7 @@ enum {
G_STRUCT_OFFSET (_iface_struct, _sig_name_var ## _done),
\
NULL,
\
NULL,
\
- e_gdbus_marshallers_VOID__UINT_BOXED_ ## _mtype,
\
+ NULL,
\
G_TYPE_NONE,
\
3,
\
G_TYPE_UINT, G_TYPE_ERROR, G_TYPE_ ## _gtype);
\
@@ -449,8 +448,7 @@ enum {
G_TYPE_FROM_INTERFACE (iface),
\
G_SIGNAL_RUN_LAST,
\
G_STRUCT_OFFSET (_iface_struct, handle_ ## _sig_name_var),
\
- NULL, NULL,
\
- e_gdbus_marshallers_BOOLEAN__OBJECT,
\
+ NULL, NULL, NULL,
\
G_TYPE_BOOLEAN,
\
1,
\
G_TYPE_DBUS_METHOD_INVOCATION);
\
@@ -462,8 +460,7 @@ enum {
G_TYPE_FROM_INTERFACE (iface),
\
G_SIGNAL_RUN_LAST,
\
G_STRUCT_OFFSET (_iface_struct, handle_ ## _sig_name_var),
\
- NULL, NULL,
\
- e_gdbus_marshallers_BOOLEAN__OBJECT_ ## _mtype,
\
+ NULL, NULL, NULL,
\
G_TYPE_BOOLEAN,
\
2,
\
G_TYPE_DBUS_METHOD_INVOCATION,
\
diff --git a/libedataserver/e-iterator.c b/libedataserver/e-iterator.c
index f2f04d7..6635630 100644
--- a/libedataserver/e-iterator.c
+++ b/libedataserver/e-iterator.c
@@ -31,8 +31,7 @@ e_iterator_class_init (EIteratorClass *class)
G_OBJECT_CLASS_TYPE (object_class),
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (EIteratorClass, invalidate),
- NULL, NULL,
- g_cclosure_marshal_VOID__VOID,
+ NULL, NULL, NULL,
G_TYPE_NONE, 0);
}
diff --git a/libedataserver/e-proxy.c b/libedataserver/e-proxy.c
index c28b0b3..48b8ce1 100644
--- a/libedataserver/e-proxy.c
+++ b/libedataserver/e-proxy.c
@@ -952,8 +952,7 @@ e_proxy_class_init (EProxyClass *class)
G_OBJECT_CLASS_TYPE (object_class),
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (EProxyClass, changed),
- NULL, NULL,
- g_cclosure_marshal_VOID__VOID,
+ NULL, NULL, NULL,
G_TYPE_NONE, 0);
}
diff --git a/libedataserver/e-source-registry.c b/libedataserver/e-source-registry.c
index ebcd59a..a2dc1dd 100644
--- a/libedataserver/e-source-registry.c
+++ b/libedataserver/e-source-registry.c
@@ -53,7 +53,6 @@
#include <e-dbus-source.h>
#include <e-dbus-source-manager.h>
-#include <libedataserver/e-marshal.h>
#include <libedataserver/e-data-server-util.h>
#include <libedataserver/e-source-collection.h>
@@ -1256,8 +1255,7 @@ e_source_registry_class_init (ESourceRegistryClass *class)
G_OBJECT_CLASS_TYPE (object_class),
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (ESourceRegistryClass, source_added),
- NULL, NULL,
- g_cclosure_marshal_VOID__OBJECT,
+ NULL, NULL, NULL,
G_TYPE_NONE, 1,
E_TYPE_SOURCE);
@@ -1274,8 +1272,7 @@ e_source_registry_class_init (ESourceRegistryClass *class)
G_OBJECT_CLASS_TYPE (object_class),
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (ESourceRegistryClass, source_changed),
- NULL, NULL,
- g_cclosure_marshal_VOID__OBJECT,
+ NULL, NULL, NULL,
G_TYPE_NONE, 1,
E_TYPE_SOURCE);
@@ -1291,8 +1288,7 @@ e_source_registry_class_init (ESourceRegistryClass *class)
G_OBJECT_CLASS_TYPE (object_class),
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (ESourceRegistryClass, source_removed),
- NULL, NULL,
- g_cclosure_marshal_VOID__OBJECT,
+ NULL, NULL, NULL,
G_TYPE_NONE, 1,
E_TYPE_SOURCE);
@@ -1308,8 +1304,7 @@ e_source_registry_class_init (ESourceRegistryClass *class)
G_OBJECT_CLASS_TYPE (object_class),
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (ESourceRegistryClass, source_enabled),
- NULL, NULL,
- g_cclosure_marshal_VOID__OBJECT,
+ NULL, NULL, NULL,
G_TYPE_NONE, 1,
E_TYPE_SOURCE);
@@ -1325,8 +1320,7 @@ e_source_registry_class_init (ESourceRegistryClass *class)
G_OBJECT_CLASS_TYPE (object_class),
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (ESourceRegistryClass, source_disabled),
- NULL, NULL,
- g_cclosure_marshal_VOID__OBJECT,
+ NULL, NULL, NULL,
G_TYPE_NONE, 1,
E_TYPE_SOURCE);
}
diff --git a/libedataserver/e-source.c b/libedataserver/e-source.c
index fe9bc50..5f9d8c8 100644
--- a/libedataserver/e-source.c
+++ b/libedataserver/e-source.c
@@ -1636,8 +1636,7 @@ e_source_class_init (ESourceClass *class)
G_TYPE_FROM_CLASS (class),
G_SIGNAL_RUN_LAST | G_SIGNAL_NO_RECURSE,
G_STRUCT_OFFSET (ESourceClass, changed),
- NULL, NULL,
- g_cclosure_marshal_VOID__VOID,
+ NULL, NULL, NULL,
G_TYPE_NONE, 0);
/* Register built-in ESourceExtension types. */
diff --git a/libedataserver/libedataserver.h b/libedataserver/libedataserver.h
index 8bae303..e9e5b8d 100644
--- a/libedataserver/libedataserver.h
+++ b/libedataserver/libedataserver.h
@@ -28,7 +28,6 @@
#include <libedataserver/e-data-server-util.h>
#include <libedataserver/e-debug-log.h>
#include <libedataserver/e-flag.h>
-#include <libedataserver/e-gdbus-marshallers.h>
#include <libedataserver/e-gdbus-templates.h>
#include <libedataserver/e-iterator.h>
#include <libedataserver/e-list-iterator.h>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
