Use the generic marshaller

Adds a requirement for GLib 2.30

14 files changed, 32 insertions, 103 deletions

diff --git a/.gitignore b/.gitignore
index e917fd7..b885bac 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,8 +12,6 @@ Makefile.in
 .#*
 *.stamp
 
-telepathy-farstream/tf-signals-marshal.[ch]
-telepathy-farstream/tf-signals-marshal.list
 telepathy-farstream/telepathy-farstream.pc
 telepathy-farstream/telepathy-farstream-uninstalled.pc
 
diff --git a/configure.ac b/configure.ac
index b61eb11..e172c1e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -84,15 +84,12 @@ if test "x$enable_coverage" = "xyes"; then
 fi
 
 dnl Check for Glib
-PKG_CHECK_MODULES(GLIB, gobject-2.0 >= 2.26 glib-2.0 >= 2.26 gio-2.0)
-AC_DEFINE(GLIB_VERSION_MIN_REQUIRED, GLIB_VERSION_2_26, [Ignore post 2.26 deprecations])
-AC_DEFINE(GLIB_VERSION_MAX_REQUIRED, GLIB_VERSION_2_26, [Prevent post 2.26 APIs])
+PKG_CHECK_MODULES(GLIB, gobject-2.0 >= 2.30 glib-2.0 >= 2.30 gio-2.0)
+AC_DEFINE(GLIB_VERSION_MIN_REQUIRED, GLIB_VERSION_2_30, [Ignore post 2.30 deprecations])
+AC_DEFINE(GLIB_VERSION_MAX_REQUIRED, GLIB_VERSION_2_30, [Prevent post 2.30 APIs])
 
-
-GLIB_GENMARSHAL=`$PKG_CONFIG --variable=glib_genmarshal glib-2.0`
 AC_SUBST(GLIB_CFLAGS)
 AC_SUBST(GLIB_LIBS)
-AC_SUBST(GLIB_GENMARSHAL)
 
 dnl Check for DBus
 PKG_CHECK_MODULES(DBUS, [dbus-1 >= 0.60, dbus-glib-1 >= 0.60])
diff --git a/doc/lib/Makefile.am b/doc/lib/Makefile.am
index 47587f8..23dbc77 100644
--- a/doc/lib/Makefile.am
+++ b/doc/lib/Makefile.am
@@ -45,7 +45,7 @@ CFILE_GLOB=$(top_srcdir)/telepathy-farstream/channel.c $(top_srcdir)/telepathy-f
 # Header files to ignore when scanning.
 # e.g. IGNORE_HFILES=gtkdebug.h gtkintl.h
 IGNORE_HFILES=channel-priv.h content-priv.h session-priv.h stream-priv.h \
-  stream.h call-channel.h call-content.h call-stream.h tf-signals-marshal.h \
+  stream.h call-channel.h call-content.h call-stream.h \
   media-signalling-channel.h media-signalling-content.h utils.h
 
 # Images to copy into HTML directory.
diff --git a/telepathy-farstream/Makefile.am b/telepathy-farstream/Makefile.am
index 7b8830c..e369a78 100644
--- a/telepathy-farstream/Makefile.am
+++ b/telepathy-farstream/Makefile.am
@@ -1,10 +1,3 @@
-BUILT_SOURCES = \
-    tf-signals-marshal.h \
-    tf-signals-marshal.c
-
-CLEANFILES = $(BUILT_SOURCES) tf-signals-marshal.list
-
-
 tfincludedir = $(includedir)/telepathy-1.0/telepathy-farstream
 tfinclude_HEADERS = \
 	telepathy-farstream.h \
@@ -63,23 +56,3 @@ libtelepathy_farstream_la_LIBADD = \
 libtelepathy_farstream_la_LDFLAGS =  -no-undefined \
 	-export-symbols-regex "^tf_(init|content_|channel_).*" \
 	-version-info "$(LT_CURRENT)":"$(LT_REVISION)":"$(LT_AGE)"
-
-
-# rules to generate signal marshallers
-tf-signals-marshal.list: $(libtelepathy_farstream_la_SOURCES) Makefile.am
-	( cd $(srcdir) && \
-	sed -n -e 's/.*_tf_marshal_\([[:upper:][:digit:]]*__[[:upper:][:digit:]_]*\).*/\1/p' \
-	$(libtelepathy_farstream_la_SOURCES) ) \
-	| sed -e 's/__/:/' -e 'y/_/,/' | sort -u > $@.tmp
-	if cmp -s $@.tmp $@; then \
-		rm $@.tmp; \
-		touch $@; \
-	else \
-		mv $@.tmp $@; \
-	fi
-
-%-signals-marshal.h: %-signals-marshal.list Makefile.in
-	glib-genmarshal --header --prefix=_$(subst -,_,$*)_marshal $< > $*-signals-marshal.h
-
-%-signals-marshal.c: %-signals-marshal.list Makefile.in
-	glib-genmarshal --body --prefix=_$(subst -,_,$*)_marshal $< > $*-signals-marshal.c
diff --git a/telepathy-farstream/call-channel.c b/telepathy-farstream/call-channel.c
index 94bdc4c..b08a83c 100644
--- a/telepathy-farstream/call-channel.c
+++ b/telepathy-farstream/call-channel.c
@@ -35,7 +35,6 @@
 #include <farstream/fs-conference.h>
 
 #include "call-content.h"
-#include "tf-signals-marshal.h"
 
 
 static void call_channel_async_initable_init (GAsyncInitableIface *asynciface);
@@ -120,29 +119,25 @@ tf_call_channel_class_init (TfCallChannelClass *klass)
   signals[SIGNAL_FS_CONFERENCE_ADDED] = g_signal_new ("fs-conference-added",
       G_OBJECT_CLASS_TYPE (klass),
       G_SIGNAL_RUN_LAST,
-      0, NULL, NULL,
-      _tf_marshal_VOID__OBJECT,
+      0, NULL, NULL, NULL,
       G_TYPE_NONE, 1, FS_TYPE_CONFERENCE);
 
   signals[SIGNAL_FS_CONFERENCE_REMOVED] = g_signal_new ("fs-conference-removed",
       G_OBJECT_CLASS_TYPE (klass),
       G_SIGNAL_RUN_LAST,
-      0, NULL, NULL,
-      _tf_marshal_VOID__OBJECT,
+      0, NULL, NULL, NULL,
       G_TYPE_NONE, 1, FS_TYPE_CONFERENCE);
 
   signals[SIGNAL_CONTENT_ADDED] = g_signal_new ("content-added",
       G_OBJECT_CLASS_TYPE (klass),
       G_SIGNAL_RUN_LAST,
-      0, NULL, NULL,
-      _tf_marshal_VOID__OBJECT,
+      0, NULL, NULL, NULL,
       G_TYPE_NONE, 1, TF_TYPE_CALL_CONTENT);
 
   signals[SIGNAL_CONTENT_REMOVED] = g_signal_new ("content-removed",
       G_OBJECT_CLASS_TYPE (klass),
       G_SIGNAL_RUN_LAST,
-      0, NULL, NULL,
-      _tf_marshal_VOID__OBJECT,
+      0, NULL, NULL, NULL,
       G_TYPE_NONE, 1, TF_TYPE_CALL_CONTENT);
 }
 
diff --git a/telepathy-farstream/call-content.c b/telepathy-farstream/call-content.c
index fc16f0e..e9b5ef0 100644
--- a/telepathy-farstream/call-content.c
+++ b/telepathy-farstream/call-content.c
@@ -53,7 +53,6 @@
 
 
 #include "call-stream.h"
-#include "tf-signals-marshal.h"
 #include "utils.h"
 
 #define DTMF_TONE_VOLUME (8)
@@ -300,8 +299,7 @@ tf_call_content_class_init (TfCallContentClass *klass)
   signals[RESOLUTION_CHANGED] = g_signal_new ("resolution-changed",
       G_OBJECT_CLASS_TYPE (klass),
       G_SIGNAL_RUN_LAST,
-      0, NULL, NULL,
-      _tf_marshal_VOID__UINT_UINT,
+      0, NULL, NULL, NULL,
       G_TYPE_NONE, 2, G_TYPE_UINT, G_TYPE_UINT);
 }
 
diff --git a/telepathy-farstream/call-stream.c b/telepathy-farstream/call-stream.c
index fc0f635..0fd66eb 100644
--- a/telepathy-farstream/call-stream.c
+++ b/telepathy-farstream/call-stream.c
@@ -51,8 +51,6 @@
 #include <string.h>
 #include <stdlib.h>
 
-
-#include "tf-signals-marshal.h"
 #include "utils.h"
 
 
diff --git a/telepathy-farstream/channel.c b/telepathy-farstream/channel.c
index fb429fb..175e863 100644
--- a/telepathy-farstream/channel.c
+++ b/telepathy-farstream/channel.c
@@ -38,7 +38,6 @@
 
 #include "channel.h"
 #include "channel-priv.h"
-#include "tf-signals-marshal.h"
 #include "media-signalling-channel.h"
 #include "media-signalling-content.h"
 #include "call-channel.h"
@@ -501,8 +500,7 @@ tf_channel_class_init (TfChannelClass *klass)
           G_OBJECT_CLASS_TYPE (klass),
           G_SIGNAL_RUN_LAST,
           0,
-          NULL, NULL,
-          g_cclosure_marshal_VOID__VOID,
+          NULL, NULL, NULL,
           G_TYPE_NONE, 0);
 
   /**
@@ -517,8 +515,7 @@ tf_channel_class_init (TfChannelClass *klass)
   signals[SIGNAL_FS_CONFERENCE_ADDED] = g_signal_new ("fs-conference-added",
       G_OBJECT_CLASS_TYPE (klass),
       G_SIGNAL_RUN_LAST,
-      0, NULL, NULL,
-      _tf_marshal_VOID__OBJECT,
+      0, NULL, NULL, NULL,
       G_TYPE_NONE, 1, FS_TYPE_CONFERENCE);
 
   /**
@@ -533,8 +530,7 @@ tf_channel_class_init (TfChannelClass *klass)
   signals[SIGNAL_FS_CONFERENCE_REMOVED] = g_signal_new ("fs-conference-removed",
       G_OBJECT_CLASS_TYPE (klass),
       G_SIGNAL_RUN_LAST,
-      0, NULL, NULL,
-      _tf_marshal_VOID__OBJECT,
+      0, NULL, NULL, NULL,
       G_TYPE_NONE, 1, FS_TYPE_CONFERENCE);
 
 
@@ -553,8 +549,7 @@ tf_channel_class_init (TfChannelClass *klass)
   signals[SIGNAL_CONTENT_ADDED] = g_signal_new ("content-added",
       G_OBJECT_CLASS_TYPE (klass),
       G_SIGNAL_RUN_LAST,
-      0, NULL, NULL,
-      _tf_marshal_VOID__OBJECT,
+      0, NULL, NULL, NULL,
       G_TYPE_NONE, 1, TF_TYPE_CONTENT);
 
   /**
@@ -568,8 +563,7 @@ tf_channel_class_init (TfChannelClass *klass)
   signals[SIGNAL_CONTENT_REMOVED] = g_signal_new ("content-removed",
       G_OBJECT_CLASS_TYPE (klass),
       G_SIGNAL_RUN_LAST,
-      0, NULL, NULL,
-      _tf_marshal_VOID__OBJECT,
+      0, NULL, NULL, NULL,
       G_TYPE_NONE, 1, TF_TYPE_CONTENT);
 }
 
diff --git a/telepathy-farstream/content.c b/telepathy-farstream/content.c
index 3327408..c2beb55 100644
--- a/telepathy-farstream/content.c
+++ b/telepathy-farstream/content.c
@@ -5,7 +5,6 @@
 #include <farstream/fs-conference.h>
 
 #include "channel.h"
-#include "tf-signals-marshal.h"
 
 
 /**
@@ -135,8 +134,7 @@ tf_content_class_init (TfContentClass *klass)
           G_OBJECT_CLASS_TYPE (klass),
           G_SIGNAL_RUN_LAST,
           0,
-          g_signal_accumulator_true_handled, NULL,
-          _tf_marshal_BOOLEAN__VOID,
+          g_signal_accumulator_true_handled, NULL, NULL,
           G_TYPE_BOOLEAN, 0);
 
   /**
@@ -151,8 +149,7 @@ tf_content_class_init (TfContentClass *klass)
       g_signal_new ("stop-sending",
           G_OBJECT_CLASS_TYPE (klass),
           G_SIGNAL_RUN_LAST,
-          0, NULL, NULL,
-          g_cclosure_marshal_VOID__BOOLEAN,
+          0, NULL, NULL, NULL,
           G_TYPE_NONE, 0);
 
   /**
@@ -174,8 +171,7 @@ tf_content_class_init (TfContentClass *klass)
       g_signal_new ("src-pad-added",
           G_OBJECT_CLASS_TYPE (klass),
           G_SIGNAL_RUN_LAST,
-          0, NULL, NULL,
-          _tf_marshal_VOID__UINT_OBJECT_OBJECT_BOXED,
+          0, NULL, NULL, NULL,
           G_TYPE_NONE, 4,
           G_TYPE_UINT, FS_TYPE_STREAM, GST_TYPE_PAD, FS_TYPE_CODEC);
 
@@ -202,8 +198,7 @@ tf_content_class_init (TfContentClass *klass)
           G_OBJECT_CLASS_TYPE (klass),
           G_SIGNAL_RUN_LAST,
           0,
-          g_signal_accumulator_true_handled, NULL,
-          _tf_marshal_BOOLEAN__POINTER_UINT,
+          g_signal_accumulator_true_handled, NULL, NULL,
           G_TYPE_BOOLEAN, 2, G_TYPE_POINTER, G_TYPE_UINT);
 
   /**
@@ -220,8 +215,7 @@ tf_content_class_init (TfContentClass *klass)
       g_signal_new ("stop-receiving",
           G_OBJECT_CLASS_TYPE (klass),
           G_SIGNAL_RUN_LAST,
-          0, NULL, NULL,
-          _tf_marshal_VOID__BOOLEAN_POINTER_UINT,
+          0, NULL, NULL, NULL,
           G_TYPE_NONE, 2, G_TYPE_POINTER, G_TYPE_UINT);
 
   /**
@@ -236,8 +230,7 @@ tf_content_class_init (TfContentClass *klass)
       g_signal_new ("restart-source",
           G_OBJECT_CLASS_TYPE (klass),
           G_SIGNAL_RUN_LAST,
-          0, NULL, NULL,
-          _tf_marshal_VOID__VOID,
+          0, NULL, NULL, NULL,
           G_TYPE_NONE, 0);
 }
 
diff --git a/telepathy-farstream/media-signalling-channel.c b/telepathy-farstream/media-signalling-channel.c
index e954332..e9b9e0e 100644
--- a/telepathy-farstream/media-signalling-channel.c
+++ b/telepathy-farstream/media-signalling-channel.c
@@ -36,7 +36,6 @@
 
 #include "stream.h"
 #include "session-priv.h"
-#include "tf-signals-marshal.h"
 
 
 
@@ -100,8 +99,7 @@ tf_media_signalling_channel_class_init (TfMediaSignallingChannelClass *klass)
           G_OBJECT_CLASS_TYPE (klass),
           G_SIGNAL_RUN_LAST,
           0,
-          NULL, NULL,
-          g_cclosure_marshal_VOID__OBJECT,
+          NULL, NULL, NULL,
           G_TYPE_NONE, 1, TF_TYPE_STREAM);
 
   /**
@@ -121,8 +119,7 @@ tf_media_signalling_channel_class_init (TfMediaSignallingChannelClass *klass)
           G_OBJECT_CLASS_TYPE (klass),
           G_SIGNAL_RUN_LAST,
           0,
-          NULL, NULL,
-          _tf_marshal_VOID__OBJECT,
+          NULL, NULL, NULL,
           G_TYPE_NONE, 1, FS_TYPE_CONFERENCE);
 
   /**
@@ -141,8 +138,7 @@ tf_media_signalling_channel_class_init (TfMediaSignallingChannelClass *klass)
           G_OBJECT_CLASS_TYPE (klass),
           G_SIGNAL_RUN_LAST,
           0,
-          NULL, NULL,
-          _tf_marshal_VOID__OBJECT_OBJECT,
+          NULL, NULL, NULL,
           G_TYPE_NONE, 2, FS_TYPE_CONFERENCE, FS_TYPE_PARTICIPANT);
 
 
@@ -151,8 +147,7 @@ tf_media_signalling_channel_class_init (TfMediaSignallingChannelClass *klass)
           G_OBJECT_CLASS_TYPE (klass),
           G_SIGNAL_RUN_LAST,
           0,
-          NULL, NULL,
-          _tf_marshal_BOXED__UINT,
+          NULL, NULL, NULL,
           FS_TYPE_CODEC_LIST, 1, G_TYPE_UINT);
 }
 
diff --git a/telepathy-farstream/media-signalling-content.c b/telepathy-farstream/media-signalling-content.c
index e11edc8..1c3e77d 100644
--- a/telepathy-farstream/media-signalling-content.c
+++ b/telepathy-farstream/media-signalling-content.c
@@ -39,7 +39,6 @@
 #include <stdarg.h>
 #include <string.h>
 
-#include "tf-signals-marshal.h"
 #include "utils.h"
 
 
diff --git a/telepathy-farstream/session.c b/telepathy-farstream/session.c
index 42cb4db..6b4f74e 100644
--- a/telepathy-farstream/session.c
+++ b/telepathy-farstream/session.c
@@ -25,7 +25,6 @@
 #include <farstream/fs-conference.h>
 
 #include "session-priv.h"
-#include "tf-signals-marshal.h"
 
 G_DEFINE_TYPE (TfSession, _tf_session, G_TYPE_OBJECT);
 
@@ -277,8 +276,7 @@ _tf_session_class_init (TfSessionClass *klass)
           G_OBJECT_CLASS_TYPE (klass),
           G_SIGNAL_RUN_LAST,
           0,
-          NULL, NULL,
-          _tf_marshal_VOID__BOXED_UINT_UINT_UINT,
+          NULL, NULL, NULL,
           G_TYPE_NONE, 4,
           DBUS_TYPE_G_OBJECT_PATH, G_TYPE_UINT, G_TYPE_UINT, G_TYPE_UINT);
   signals[INVALIDATED] =
@@ -286,8 +284,7 @@ _tf_session_class_init (TfSessionClass *klass)
           G_OBJECT_CLASS_TYPE (klass),
           G_SIGNAL_RUN_LAST,
           0,
-          NULL, NULL,
-          g_cclosure_marshal_VOID__VOID,
+          NULL, NULL, NULL,
           G_TYPE_NONE, 0);
 }
 
diff --git a/telepathy-farstream/stream.c b/telepathy-farstream/stream.c
index 5afd9ad..2039dfe 100644
--- a/telepathy-farstream/stream.c
+++ b/telepathy-farstream/stream.c
@@ -47,7 +47,6 @@
 
 #include "stream.h"
 #include "media-signalling-channel.h"
-#include "tf-signals-marshal.h"
 #include "utils.h"
 
 G_DEFINE_TYPE (TfStream, tf_stream, G_TYPE_OBJECT);
@@ -639,8 +638,7 @@ tf_stream_class_init (TfStreamClass *klass)
           G_OBJECT_CLASS_TYPE (klass),
           G_SIGNAL_RUN_LAST,
           0,
-          NULL, NULL,
-          g_cclosure_marshal_VOID__VOID,
+          NULL, NULL, NULL,
           G_TYPE_NONE, 0);
 
   /**
@@ -655,8 +653,7 @@ tf_stream_class_init (TfStreamClass *klass)
           G_OBJECT_CLASS_TYPE (klass),
           G_SIGNAL_RUN_LAST,
           0,
-          NULL, NULL,
-          g_cclosure_marshal_VOID__VOID,
+          NULL, NULL, NULL,
           G_TYPE_NONE, 0);
 
   /**
@@ -678,8 +675,7 @@ tf_stream_class_init (TfStreamClass *klass)
           G_OBJECT_CLASS_TYPE (klass),
           G_SIGNAL_RUN_LAST,
           0,
-          g_signal_accumulator_true_handled, NULL,
-          _tf_marshal_BOOLEAN__UINT,
+          g_signal_accumulator_true_handled, NULL, NULL,
           G_TYPE_BOOLEAN, 1, G_TYPE_UINT);
 
   /**
@@ -697,8 +693,7 @@ tf_stream_class_init (TfStreamClass *klass)
           G_OBJECT_CLASS_TYPE (klass),
           G_SIGNAL_RUN_LAST,
           0,
-          NULL, NULL,
-          g_cclosure_marshal_VOID__UINT,
+          NULL, NULL, NULL,
           G_TYPE_NONE, 1, G_TYPE_UINT);
 
   /**
@@ -716,8 +711,7 @@ tf_stream_class_init (TfStreamClass *klass)
           G_OBJECT_CLASS_TYPE (klass),
           G_SIGNAL_RUN_LAST,
           0,
-          NULL, NULL,
-          _tf_marshal_VOID__OBJECT_BOXED,
+          NULL, NULL, NULL,
           G_TYPE_NONE, 2, GST_TYPE_PAD, FS_TYPE_CODEC);
 
 
@@ -734,8 +728,7 @@ tf_stream_class_init (TfStreamClass *klass)
           G_OBJECT_CLASS_TYPE (klass),
           G_SIGNAL_RUN_LAST,
           0,
-          NULL, NULL,
-          _tf_marshal_VOID__VOID,
+          NULL, NULL, NULL,
           G_TYPE_NONE, 0);
 }
 
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 4e77677..49d7f4f 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -6,7 +6,6 @@ EXTRA_DIST = \
     glib-ginterface-gen.py \
     glib-gtypes-generator.py \
     glib-interfaces-gen.py \
-    glib-signals-marshal-gen.py \
     libglibcodegen.py \
     libtpcodegen.py \
     xincludator.py