GNOME.org
 

[evolution-data-server] libebook: Use g_cclosure_marshal_generic() for all signals.

commit da2761c7fa3de2c5c3f19a6e1d24c0ae4173d7a5
Author: Matthew Barnes <mbarnes redhat com>
Date:   Sat Mar 2 23:15:28 2013 -0500

    libebook: 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-book-marshal.list, as it is no longer needed.

 addressbook/libebook/Makefile.am                   |   10 ++--------
 addressbook/libebook/e-book-client-view.c          |   16 +++++-----------
 addressbook/libebook/e-book-marshal.list           |    6 ------
 addressbook/libebook/e-book-view.c                 |   19 ++++++-------------
 addressbook/libebook/e-book.c                      |   10 +++-------
 addressbook/libebook/e-destination.c               |    3 +--
 docs/reference/addressbook/libebook/Makefile.am    |    1 -
 .../addressbook/libedata-book/Makefile.am          |    1 -
 8 files changed, 17 insertions(+), 49 deletions(-)
---
diff --git a/addressbook/libebook/Makefile.am b/addressbook/libebook/Makefile.am
index 8d7bb85..5613bb1 100644
--- a/addressbook/libebook/Makefile.am
+++ b/addressbook/libebook/Makefile.am
@@ -11,10 +11,6 @@ e-book-enumtypes.c: e-book-enumtypes.c.template $(ENUM_TYPES)
 
 ENUM_GENERATED = e-book-enumtypes.h e-book-enumtypes.c
 
-# The marshallers
-MARSHAL_GENERATED = e-book-marshal.c e-book-marshal.h
- EVO_MARSHAL_RULE@
-
 # The library
 lib_LTLIBRARIES = libebook-1.2.la
 
@@ -39,7 +35,6 @@ libebook_1_2_la_CPPFLAGS = \
 
 libebook_1_2_la_SOURCES =                              \
        $(ENUM_GENERATED)                               \
-       $(MARSHAL_GENERATED)                            \
        e-book-client.c                                 \
        e-book-client-view.c                            \
        e-book-view-private.h                           \
@@ -142,15 +137,14 @@ typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
 CLEANFILES += $(dist_gir_DATA) $(typelib_DATA)
 endif
 
-BUILT_SOURCES += $(ENUM_GENERATED) $(MARSHAL_GENERATED)
+BUILT_SOURCES += $(ENUM_GENERATED)
 CLEANFILES    += $(BUILT_SOURCES)
 DISTCLEANFILES = $(pkgconfig_DATA)
 
 EXTRA_DIST =                                           \
        $(pkgconfig_DATA:-$(API_VERSION).pc=.pc.in)     \
        e-book-enumtypes.h.template                     \
-       e-book-enumtypes.c.template                     \
-       e-book-marshal.list
+       e-book-enumtypes.c.template
 
 dist-hook:
        cd $(distdir); rm -f $(BUILT_SOURCES)
diff --git a/addressbook/libebook/e-book-client-view.c b/addressbook/libebook/e-book-client-view.c
index c26dc38..dd91607 100644
--- a/addressbook/libebook/e-book-client-view.c
+++ b/addressbook/libebook/e-book-client-view.c
@@ -31,7 +31,6 @@
 
 #include "e-book-client.h"
 #include "e-book-client-view.h"
-#include "e-book-marshal.h"
 #include "e-gdbus-book-view.h"
 
 #define E_BOOK_CLIENT_VIEW_GET_PRIVATE(obj) \
@@ -877,8 +876,7 @@ e_book_client_view_class_init (EBookClientViewClass *class)
                G_OBJECT_CLASS_TYPE (object_class),
                G_SIGNAL_RUN_LAST,
                G_STRUCT_OFFSET (EBookClientViewClass, objects_added),
-               NULL, NULL,
-               g_cclosure_marshal_VOID__POINTER,
+               NULL, NULL, NULL,
                G_TYPE_NONE, 1,
                G_TYPE_POINTER);
 
@@ -887,8 +885,7 @@ e_book_client_view_class_init (EBookClientViewClass *class)
                G_OBJECT_CLASS_TYPE (object_class),
                G_SIGNAL_RUN_LAST,
                G_STRUCT_OFFSET (EBookClientViewClass, objects_modified),
-               NULL, NULL,
-               g_cclosure_marshal_VOID__POINTER,
+               NULL, NULL, NULL,
                G_TYPE_NONE, 1,
                G_TYPE_POINTER);
 
@@ -897,8 +894,7 @@ e_book_client_view_class_init (EBookClientViewClass *class)
                G_OBJECT_CLASS_TYPE (object_class),
                G_SIGNAL_RUN_LAST,
                G_STRUCT_OFFSET (EBookClientViewClass, objects_removed),
-               NULL, NULL,
-               g_cclosure_marshal_VOID__POINTER,
+               NULL, NULL, NULL,
                G_TYPE_NONE, 1,
                G_TYPE_POINTER);
 
@@ -907,8 +903,7 @@ e_book_client_view_class_init (EBookClientViewClass *class)
                G_OBJECT_CLASS_TYPE (object_class),
                G_SIGNAL_RUN_LAST,
                G_STRUCT_OFFSET (EBookClientViewClass, progress),
-               NULL, NULL,
-               e_gdbus_marshallers_VOID__UINT_STRING,
+               NULL, NULL, NULL,
                G_TYPE_NONE, 2,
                G_TYPE_UINT,
                G_TYPE_STRING);
@@ -918,8 +913,7 @@ e_book_client_view_class_init (EBookClientViewClass *class)
                G_OBJECT_CLASS_TYPE (object_class),
                G_SIGNAL_RUN_LAST,
                G_STRUCT_OFFSET (EBookClientViewClass, complete),
-               NULL, NULL,
-               g_cclosure_marshal_VOID__BOXED,
+               NULL, NULL, NULL,
                G_TYPE_NONE, 1,
                G_TYPE_ERROR);
 }
diff --git a/addressbook/libebook/e-book-view.c b/addressbook/libebook/e-book-view.c
index 19c9adf..7d78336 100644
--- a/addressbook/libebook/e-book-view.c
+++ b/addressbook/libebook/e-book-view.c
@@ -24,7 +24,6 @@
 #include "e-book-view.h"
 #include "e-book-view-private.h"
 #include "e-book-enumtypes.h"
-#include "e-book-marshal.h"
 
 G_DEFINE_TYPE (EBookView, e_book_view, G_TYPE_OBJECT);
 
@@ -203,8 +202,7 @@ e_book_view_class_init (EBookViewClass *class)
                G_OBJECT_CLASS_TYPE (object_class),
                G_SIGNAL_RUN_LAST,
                G_STRUCT_OFFSET (EBookViewClass, contacts_changed),
-               NULL, NULL,
-               e_book_marshal_NONE__POINTER,
+               NULL, NULL, NULL,
                G_TYPE_NONE, 1, G_TYPE_POINTER);
 
        signals[CONTACTS_REMOVED] = g_signal_new (
@@ -212,8 +210,7 @@ e_book_view_class_init (EBookViewClass *class)
                G_OBJECT_CLASS_TYPE (object_class),
                G_SIGNAL_RUN_LAST,
                G_STRUCT_OFFSET (EBookViewClass, contacts_removed),
-               NULL, NULL,
-               e_book_marshal_NONE__POINTER,
+               NULL, NULL, NULL,
                G_TYPE_NONE, 1, G_TYPE_POINTER);
 
        signals[CONTACTS_ADDED] = g_signal_new (
@@ -221,8 +218,7 @@ e_book_view_class_init (EBookViewClass *class)
                G_OBJECT_CLASS_TYPE (object_class),
                G_SIGNAL_RUN_LAST,
                G_STRUCT_OFFSET (EBookViewClass, contacts_added),
-               NULL, NULL,
-               e_book_marshal_NONE__POINTER,
+               NULL, NULL, NULL,
                G_TYPE_NONE, 1, G_TYPE_POINTER);
 
        /* XXX The "sequence-complete" signal is deprecated. */
@@ -231,8 +227,7 @@ e_book_view_class_init (EBookViewClass *class)
                G_OBJECT_CLASS_TYPE (object_class),
                G_SIGNAL_RUN_LAST,
                G_STRUCT_OFFSET (EBookViewClass, sequence_complete),
-               NULL, NULL,
-               e_book_marshal_NONE__INT,
+               NULL, NULL, NULL,
                G_TYPE_NONE, 1, G_TYPE_UINT);
 
        signals[VIEW_COMPLETE] = g_signal_new (
@@ -240,8 +235,7 @@ e_book_view_class_init (EBookViewClass *class)
                G_OBJECT_CLASS_TYPE (object_class),
                G_SIGNAL_RUN_LAST,
                G_STRUCT_OFFSET (EBookViewClass, view_complete),
-               NULL, NULL,
-               e_book_marshal_NONE__UINT_STRING,
+               NULL, NULL, NULL,
                G_TYPE_NONE, 2, G_TYPE_UINT, G_TYPE_STRING);
 
        signals[STATUS_MESSAGE] = g_signal_new (
@@ -249,8 +243,7 @@ e_book_view_class_init (EBookViewClass *class)
                G_OBJECT_CLASS_TYPE (object_class),
                G_SIGNAL_RUN_LAST,
                G_STRUCT_OFFSET (EBookViewClass, status_message),
-               NULL, NULL,
-               e_book_marshal_NONE__STRING,
+               NULL, NULL, NULL,
                G_TYPE_NONE, 1, G_TYPE_STRING);
 }
 
diff --git a/addressbook/libebook/e-book.c b/addressbook/libebook/e-book.c
index 8b25fd1..952efa7 100644
--- a/addressbook/libebook/e-book.c
+++ b/addressbook/libebook/e-book.c
@@ -41,7 +41,6 @@
 #include "e-book.h"
 #include "e-error.h"
 #include "e-book-view-private.h"
-#include "e-book-marshal.h"
 
 #define E_BOOK_GET_PRIVATE(obj) \
        (G_TYPE_INSTANCE_GET_PRIVATE \
@@ -267,8 +266,7 @@ e_book_class_init (EBookClass *class)
                G_OBJECT_CLASS_TYPE (object_class),
                G_SIGNAL_RUN_LAST,
                G_STRUCT_OFFSET (EBookClass, writable_status),
-               NULL, NULL,
-               e_book_marshal_NONE__BOOL,
+               NULL, NULL, NULL,
                G_TYPE_NONE, 1,
                G_TYPE_BOOLEAN);
 
@@ -277,8 +275,7 @@ e_book_class_init (EBookClass *class)
                G_OBJECT_CLASS_TYPE (object_class),
                G_SIGNAL_RUN_LAST,
                G_STRUCT_OFFSET (EBookClass, connection_status),
-               NULL, NULL,
-               e_book_marshal_NONE__BOOL,
+               NULL, NULL, NULL,
                G_TYPE_NONE, 1,
                G_TYPE_BOOLEAN);
 
@@ -287,8 +284,7 @@ e_book_class_init (EBookClass *class)
                G_OBJECT_CLASS_TYPE (object_class),
                G_SIGNAL_RUN_LAST,
                G_STRUCT_OFFSET (EBookClass, backend_died),
-               NULL, NULL,
-               e_book_marshal_NONE__NONE,
+               NULL, NULL, NULL,
                G_TYPE_NONE, 0);
 }
 
diff --git a/addressbook/libebook/e-destination.c b/addressbook/libebook/e-destination.c
index e4dd576..3c0dc73 100644
--- a/addressbook/libebook/e-destination.c
+++ b/addressbook/libebook/e-destination.c
@@ -156,8 +156,7 @@ e_destination_class_init (EDestinationClass *class)
                G_OBJECT_CLASS_TYPE (object_class),
                G_SIGNAL_RUN_LAST,
                G_STRUCT_OFFSET (EDestinationClass, changed),
-               NULL, NULL,
-               g_cclosure_marshal_VOID__VOID,
+               NULL, NULL, NULL,
                G_TYPE_NONE, 0);
 }
 
diff --git a/docs/reference/addressbook/libebook/Makefile.am b/docs/reference/addressbook/libebook/Makefile.am
index 9f1e30b..c0eb9ca 100644
--- a/docs/reference/addressbook/libebook/Makefile.am
+++ b/docs/reference/addressbook/libebook/Makefile.am
@@ -21,7 +21,6 @@ CFILE_GLOB = $(top_srcdir)/addressbook/libebook/*.c
 
 IGNORE_HFILES = \
        e-book-enumtypes.h                              \
-       e-book-marshal.h                                \
        e-data-book-bindings.h                          \
        e-data-book-factory-bindings.h                  \
        e-data-book-view-bindings.h
diff --git a/docs/reference/addressbook/libedata-book/Makefile.am 
b/docs/reference/addressbook/libedata-book/Makefile.am
index 5a68184..0c44074 100644
--- a/docs/reference/addressbook/libedata-book/Makefile.am
+++ b/docs/reference/addressbook/libedata-book/Makefile.am
@@ -20,7 +20,6 @@ CFILE_GLOB = $(top_srcdir)/addressbook/libedata-book/*.c
 IGNORE_HFILES = \
        e-data-book-glue.h                              \
        e-data-book-factory-glue.h                      \
-       e-data-book-marshal.h                           \
        e-data-book-view-glue.h                         \
        e-data-book-types.h                             \
        opid.h
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]