GNOME.org
 

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

commit 777b459eacccce225ea7df89296a50c1e596d06d
Author: Matthew Barnes <mbarnes redhat com>
Date:   Sat Mar 2 23:36:49 2013 -0500

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

 calendar/libecal/Makefile.am                     |   10 +----
 calendar/libecal/e-cal-client-view.c             |   17 +++-------
 calendar/libecal/e-cal-client.c                  |    3 +-
 calendar/libecal/e-cal-marshal.list              |    3 --
 calendar/libecal/e-cal-view.c                    |   39 +++++++++++----------
 calendar/libecal/e-cal.c                         |   22 +++++-------
 calendar/libecal/e-timezone-cache.c              |    3 +-
 docs/reference/calendar/libecal/Makefile.am      |    1 -
 docs/reference/calendar/libedata-cal/Makefile.am |    1 -
 9 files changed, 38 insertions(+), 61 deletions(-)
---
diff --git a/calendar/libecal/Makefile.am b/calendar/libecal/Makefile.am
index c3921f7..46945fa 100644
--- a/calendar/libecal/Makefile.am
+++ b/calendar/libecal/Makefile.am
@@ -8,10 +8,6 @@ e-cal-enumtypes.c: e-cal-enumtypes.c.template $(ENUM_TYPES)
 
 ENUM_GENERATED = e-cal-enumtypes.h e-cal-enumtypes.c
 
-# The marshallers
-MARSHAL_GENERATED = e-cal-marshal.c e-cal-marshal.h
- EVO_MARSHAL_RULE@
-
 # The library
 lib_LTLIBRARIES = libecal-1.2.la
 
@@ -38,7 +34,6 @@ libecal_1_2_la_CPPFLAGS =                     \
 
 libecal_1_2_la_SOURCES =                       \
        $(ENUM_GENERATED)                       \
-       $(MARSHAL_GENERATED)                    \
        e-cal.c                                 \
        e-cal-client.c                          \
        e-cal-client-view.c                     \
@@ -90,15 +85,14 @@ libecalinclude_HEADERS =    \
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = libecal-$(API_VERSION).pc
 
-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-cal-enumtypes.h.template                      \
-       e-cal-enumtypes.c.template                      \
-       e-cal-marshal.list
+       e-cal-enumtypes.c.template
 
 dist-hook:
        cd $(distdir); rm -f $(BUILT_SOURCES)
diff --git a/calendar/libecal/e-cal-client-view.c b/calendar/libecal/e-cal-client-view.c
index ce48269..f4773ce 100644
--- a/calendar/libecal/e-cal-client-view.c
+++ b/calendar/libecal/e-cal-client-view.c
@@ -31,8 +31,6 @@
 #include "e-cal-client.h"
 #include "e-cal-client-view.h"
 
-#include "libedataserver/e-gdbus-marshallers.h"
-
 #include "e-gdbus-cal-view.h"
 
 #define E_CAL_CLIENT_VIEW_GET_PRIVATE(obj) \
@@ -700,8 +698,7 @@ e_cal_client_view_class_init (ECalClientViewClass *class)
                G_TYPE_FROM_CLASS (class),
                G_SIGNAL_RUN_FIRST,
                G_STRUCT_OFFSET (ECalClientViewClass, objects_added),
-               NULL, NULL,
-               g_cclosure_marshal_VOID__POINTER,
+               NULL, NULL, NULL,
                G_TYPE_NONE, 1,
                G_TYPE_POINTER);
 
@@ -715,8 +712,7 @@ e_cal_client_view_class_init (ECalClientViewClass *class)
                G_TYPE_FROM_CLASS (class),
                G_SIGNAL_RUN_FIRST,
                G_STRUCT_OFFSET (ECalClientViewClass, objects_modified),
-               NULL, NULL,
-               g_cclosure_marshal_VOID__POINTER,
+               NULL, NULL, NULL,
                G_TYPE_NONE, 1,
                G_TYPE_POINTER);
 
@@ -730,8 +726,7 @@ e_cal_client_view_class_init (ECalClientViewClass *class)
                G_TYPE_FROM_CLASS (class),
                G_SIGNAL_RUN_FIRST,
                G_STRUCT_OFFSET (ECalClientViewClass, objects_removed),
-               NULL, NULL,
-               g_cclosure_marshal_VOID__POINTER,
+               NULL, NULL, NULL,
                G_TYPE_NONE, 1,
                G_TYPE_POINTER);
 
@@ -740,8 +735,7 @@ e_cal_client_view_class_init (ECalClientViewClass *class)
                G_TYPE_FROM_CLASS (class),
                G_SIGNAL_RUN_FIRST,
                G_STRUCT_OFFSET (ECalClientViewClass, progress),
-               NULL, NULL,
-               e_gdbus_marshallers_VOID__UINT_STRING,
+               NULL, NULL, NULL,
                G_TYPE_NONE, 2,
                G_TYPE_UINT,
                G_TYPE_STRING);
@@ -751,8 +745,7 @@ e_cal_client_view_class_init (ECalClientViewClass *class)
                G_TYPE_FROM_CLASS (class),
                G_SIGNAL_RUN_FIRST,
                G_STRUCT_OFFSET (ECalClientViewClass, complete),
-               NULL, NULL,
-               g_cclosure_marshal_VOID__BOXED,
+               NULL, NULL, NULL,
                G_TYPE_NONE, 1,
                G_TYPE_ERROR);
 }
diff --git a/calendar/libecal/e-cal-client.c b/calendar/libecal/e-cal-client.c
index bd85c50..1ef0ad5 100644
--- a/calendar/libecal/e-cal-client.c
+++ b/calendar/libecal/e-cal-client.c
@@ -1404,8 +1404,7 @@ e_cal_client_class_init (ECalClientClass *class)
                G_OBJECT_CLASS_TYPE (class),
                G_SIGNAL_RUN_FIRST,
                G_STRUCT_OFFSET (ECalClientClass, free_busy_data),
-               NULL, NULL,
-               g_cclosure_marshal_VOID__POINTER,
+               NULL, NULL, NULL,
                G_TYPE_NONE, 1,
                G_TYPE_POINTER);
 }
diff --git a/calendar/libecal/e-cal-view.c b/calendar/libecal/e-cal-view.c
index f034102..91c7fd3 100644
--- a/calendar/libecal/e-cal-view.c
+++ b/calendar/libecal/e-cal-view.c
@@ -26,7 +26,6 @@
 #endif
 
 #include <string.h>
-#include "e-cal-marshal.h"
 #include "e-cal.h"
 #include "e-cal-view.h"
 #include "e-cal-view-private.h"
@@ -193,9 +192,9 @@ e_cal_view_class_init (ECalViewClass *class)
                G_TYPE_FROM_CLASS (class),
                G_SIGNAL_RUN_FIRST,
                G_STRUCT_OFFSET (ECalViewClass, objects_added),
-               NULL, NULL,
-               g_cclosure_marshal_VOID__POINTER,
-               G_TYPE_NONE, 1, G_TYPE_POINTER);
+               NULL, NULL, NULL,
+               G_TYPE_NONE, 1,
+               G_TYPE_POINTER);
 
        /**
         * ECalView::objects-modified:
@@ -207,9 +206,9 @@ e_cal_view_class_init (ECalViewClass *class)
                G_TYPE_FROM_CLASS (class),
                G_SIGNAL_RUN_FIRST,
                G_STRUCT_OFFSET (ECalViewClass, objects_modified),
-               NULL, NULL,
-               g_cclosure_marshal_VOID__POINTER,
-               G_TYPE_NONE, 1, G_TYPE_POINTER);
+               NULL, NULL, NULL,
+               G_TYPE_NONE, 1,
+               G_TYPE_POINTER);
 
        /**
         * ECalView::objects-removed:
@@ -221,18 +220,19 @@ e_cal_view_class_init (ECalViewClass *class)
                G_TYPE_FROM_CLASS (class),
                G_SIGNAL_RUN_FIRST,
                G_STRUCT_OFFSET (ECalViewClass, objects_removed),
-               NULL, NULL,
-               g_cclosure_marshal_VOID__POINTER,
-               G_TYPE_NONE, 1, G_TYPE_POINTER);
+               NULL, NULL, NULL,
+               G_TYPE_NONE, 1,
+               G_TYPE_POINTER);
 
        signals[VIEW_PROGRESS] = g_signal_new (
                "view_progress",
                G_TYPE_FROM_CLASS (class),
                G_SIGNAL_RUN_FIRST,
                G_STRUCT_OFFSET (ECalViewClass, view_progress),
-               NULL, NULL,
-               e_cal_marshal_VOID__STRING_UINT,
-               G_TYPE_NONE, 2, G_TYPE_STRING, G_TYPE_UINT);
+               NULL, NULL, NULL,
+               G_TYPE_NONE, 2,
+               G_TYPE_STRING,
+               G_TYPE_UINT);
 
        /* XXX The "view-done" signal is deprecated. */
        signals[VIEW_DONE] = g_signal_new (
@@ -240,18 +240,19 @@ e_cal_view_class_init (ECalViewClass *class)
                G_TYPE_FROM_CLASS (class),
                G_SIGNAL_RUN_FIRST,
                G_STRUCT_OFFSET (ECalViewClass, view_done),
-               NULL, NULL,
-               g_cclosure_marshal_VOID__INT,
-               G_TYPE_NONE, 1, G_TYPE_INT);
+               NULL, NULL, NULL,
+               G_TYPE_NONE, 1,
+               G_TYPE_INT);
 
        signals[VIEW_COMPLETE] = g_signal_new (
                "view_complete",
                G_TYPE_FROM_CLASS (class),
                G_SIGNAL_RUN_FIRST,
                G_STRUCT_OFFSET (ECalViewClass, view_complete),
-               NULL, NULL,
-               e_cal_marshal_VOID__UINT_STRING,
-               G_TYPE_NONE, 2, G_TYPE_UINT, G_TYPE_STRING);
+               NULL, NULL, NULL,
+               G_TYPE_NONE, 2,
+               G_TYPE_UINT,
+               G_TYPE_STRING);
 }
 
 static void
diff --git a/calendar/libecal/e-cal.c b/calendar/libecal/e-cal.c
index 917aa45..070d121 100644
--- a/calendar/libecal/e-cal.c
+++ b/calendar/libecal/e-cal.c
@@ -44,7 +44,6 @@
 
 #include "e-cal-client.h"
 #include "e-cal-check-timezones.h"
-#include "e-cal-marshal.h"
 #include "e-cal-time-util.h"
 #include "e-cal-view-private.h"
 #include "e-cal.h"
@@ -483,9 +482,9 @@ e_cal_class_init (ECalClass *class)
                G_TYPE_FROM_CLASS (class),
                G_SIGNAL_RUN_FIRST,
                G_STRUCT_OFFSET (ECalClass, cal_opened),
-               NULL, NULL,
-               g_cclosure_marshal_VOID__INT,
-               G_TYPE_NONE, 1, G_TYPE_INT);
+               NULL, NULL, NULL,
+               G_TYPE_NONE, 1,
+               G_TYPE_INT);
 
        /**
         * ECal::cal-opened-ex:
@@ -497,17 +496,16 @@ e_cal_class_init (ECalClass *class)
                G_TYPE_FROM_CLASS (class),
                G_SIGNAL_RUN_FIRST,
                G_STRUCT_OFFSET (ECalClass, cal_opened_ex),
-               NULL, NULL,
-               g_cclosure_marshal_VOID__POINTER,
-               G_TYPE_NONE, 1, G_TYPE_POINTER);
+               NULL, NULL, NULL,
+               G_TYPE_NONE, 1,
+               G_TYPE_POINTER);
 
        signals[CAL_SET_MODE] = g_signal_new (
                "cal_set_mode",
                G_TYPE_FROM_CLASS (class),
                G_SIGNAL_RUN_FIRST,
                G_STRUCT_OFFSET (ECalClass, cal_set_mode),
-               NULL, NULL,
-               e_cal_marshal_VOID__ENUM_ENUM,
+               NULL, NULL, NULL,
                G_TYPE_NONE, 2,
                E_CAL_SET_MODE_STATUS_ENUM_TYPE,
                CAL_MODE_ENUM_TYPE);
@@ -517,8 +515,7 @@ e_cal_class_init (ECalClass *class)
                G_TYPE_FROM_CLASS (class),
                G_SIGNAL_RUN_FIRST,
                G_STRUCT_OFFSET (ECalClass, backend_error),
-               NULL, NULL,
-               g_cclosure_marshal_VOID__STRING,
+               NULL, NULL, NULL,
                G_TYPE_NONE, 1,
                G_TYPE_STRING);
 
@@ -527,8 +524,7 @@ e_cal_class_init (ECalClass *class)
                G_TYPE_FROM_CLASS (class),
                G_SIGNAL_RUN_FIRST,
                G_STRUCT_OFFSET (ECalClass, backend_died),
-               NULL, NULL,
-               g_cclosure_marshal_VOID__VOID,
+               NULL, NULL, NULL,
                G_TYPE_NONE, 0);
 }
 
diff --git a/calendar/libecal/e-timezone-cache.c b/calendar/libecal/e-timezone-cache.c
index 4952c22..353e601 100644
--- a/calendar/libecal/e-timezone-cache.c
+++ b/calendar/libecal/e-timezone-cache.c
@@ -49,8 +49,7 @@ e_timezone_cache_default_init (ETimezoneCacheInterface *interface)
                G_OBJECT_CLASS_TYPE (interface),
                G_SIGNAL_RUN_FIRST,
                G_STRUCT_OFFSET (ETimezoneCacheInterface, timezone_added),
-               NULL, NULL,
-               g_cclosure_marshal_VOID__POINTER,
+               NULL, NULL, NULL,
                G_TYPE_NONE, 1,
                G_TYPE_POINTER);
 }
diff --git a/docs/reference/calendar/libecal/Makefile.am b/docs/reference/calendar/libecal/Makefile.am
index 4d4b8e8..69daef8 100644
--- a/docs/reference/calendar/libecal/Makefile.am
+++ b/docs/reference/calendar/libecal/Makefile.am
@@ -19,7 +19,6 @@ CFILE_GLOB = $(top_srcdir)/calendar/libecal/*.c
 
 IGNORE_HFILES = \
        e-cal-enumtypes.h                                       \
-       e-cal-marshal.h                                         \
        e-data-cal-bindings.h                                   \
        e-data-cal-factory-bindings.h                           \
        e-data-cal-view-bindings.h
diff --git a/docs/reference/calendar/libedata-cal/Makefile.am 
b/docs/reference/calendar/libedata-cal/Makefile.am
index eebfedd..8722bf2 100644
--- a/docs/reference/calendar/libedata-cal/Makefile.am
+++ b/docs/reference/calendar/libedata-cal/Makefile.am
@@ -22,7 +22,6 @@ IGNORE_HFILES = \
        e-data-cal-glue.h                               \
        e-data-cal-factory-glue.h                       \
        e-data-cal-view-glue.h                          \
-       e-data-cal-marshal.h                            \
        e-data-cal-types.h
 
 GTKDOC_CFLAGS = \
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]