Use g_cclosure_marshal_generic for all signals

No more ugly marshallers \o/

10 files changed, 30 insertions, 67 deletions

diff --git a/src/Makefile.am b/src/Makefile.am
index ef4e8d964..c6855d338 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -59,11 +59,6 @@ libexec_PROGRAMS = \
 	empathy-av \
 	empathy-chat
 
-BUILT_SOURCES = \
-	src-marshal.h \
-	src-marshal.c \
-	src-marshal.list
-
 empathy_accounts_SOURCES =						\
 	empathy-accounts.c empathy-accounts.h				\
 	$(NULL)
@@ -102,8 +97,6 @@ empathy_av_SOURCES = \
 	empathy-mic-monitor.h
 	$(NULL)
 
-nodist_empathy_av_SOURCES = $(BUILT_SOURCES)
-
 empathy_av_CFLAGS = $(EMPATHY_AV_CFLAGS)
 empathy_av_LDFLAGS = $(EMPATHY_AV_LIBS) $(LIBM)
 
@@ -161,8 +154,6 @@ empathy_call_SOURCES = \
        empathy-mic-monitor.c \
        empathy-mic-monitor.h
 
-nodist_empathy_call_SOURCES = $(BUILT_SOURCES)
-
 empathy_call_CFLAGS = $(EMPATHY_CALL_CFLAGS)
 empathy_call_LDFLAGS = $(EMPATHY_CALL_LIBS)
 
@@ -198,8 +189,6 @@ empathy_LDADD =								\
         $(LIBCHAMPLAIN_LIBS)						\
 	$(NULL)
 
-nodist_empathy_SOURCES = $(BUILT_SOURCES)
-
 check_c_sources = \
     $(empathy_handwritten_source) \
     $(empathy_logs_SOURCES) \
@@ -246,23 +235,3 @@ dist_man_MANS =			\
 	empathy.1 \
 	empathy-accounts.1
 
-src-marshal.list: $(empathy_SOURCES) $(empathy_call_SOURCES) Makefile.am
-	$(AM_V_GEN)( cd $(srcdir) && \
-	sed -n -e 's/.*src_marshal_\([[:upper:][:digit:]]*__[[:upper:][:digit:]_]*\).*/\1/p' \
-	$(empathy_SOURCES) $(empathy_av_SOURCES) $(empathy_call_SOURCES) ) \
-	| sed -e 's/__/:/' -e 'y/_/,/' | sort -u > $@.tmp
-	@if cmp -s $@.tmp $@; then \
-		rm $@.tmp; \
-	else \
-		mv $@.tmp $@; \
-	fi
-
-%-marshal.h: %-marshal.list Makefile
-	$(AM_V_GEN)$(GLIB_GENMARSHAL) --header --prefix=_$(subst -,_,$*)_marshal $< > $*-marshal.h
-
-%-marshal.c: %-marshal.list Makefile
-	$(AM_V_GEN)echo "#include \"src-marshal.h\"" > $@ && \
-	$(GLIB_GENMARSHAL) --body --prefix=_$(subst -,_,$*)_marshal $< >> $*-marshal.c
-
-CLEANFILES = $(BUILT_SOURCES)
-
diff --git a/src/empathy-audio-src.c b/src/empathy-audio-src.c
index 203082dce..b287555a0 100644
--- a/src/empathy-audio-src.c
+++ b/src/empathy-audio-src.c
@@ -27,7 +27,6 @@
 
 #include "empathy-audio-src.h"
 
-#include "src-marshal.h"
 #include "empathy-mic-monitor.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_VOIP
@@ -336,7 +335,7 @@ empathy_audio_src_class_init (EmpathyGstAudioSrcClass
     G_SIGNAL_RUN_LAST,
     0,
     NULL, NULL,
-    g_cclosure_marshal_VOID__DOUBLE,
+    g_cclosure_marshal_generic,
     G_TYPE_NONE, 1, G_TYPE_DOUBLE);
 
   param_spec = g_param_spec_double ("rms-level", "RMS level", "RMS level",
@@ -349,7 +348,7 @@ empathy_audio_src_class_init (EmpathyGstAudioSrcClass
     G_SIGNAL_RUN_LAST,
     0,
     NULL, NULL,
-    g_cclosure_marshal_VOID__DOUBLE,
+    g_cclosure_marshal_generic,
     G_TYPE_NONE, 1, G_TYPE_DOUBLE);
 }
 
diff --git a/src/empathy-call-factory.c b/src/empathy-call-factory.c
index ba17270c7..b3c85f4b0 100644
--- a/src/empathy-call-factory.c
+++ b/src/empathy-call-factory.c
@@ -36,7 +36,6 @@
 
 #include "empathy-call-factory.h"
 #include "empathy-call-handler.h"
-#include "src-marshal.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_VOIP
 #include <libempathy/empathy-debug.h>
@@ -141,7 +140,7 @@ empathy_call_factory_class_init (EmpathyCallFactoryClass *klass)
       G_TYPE_FROM_CLASS (klass),
       G_SIGNAL_RUN_LAST, 0,
       NULL, NULL,
-      _src_marshal_VOID__OBJECT_BOOLEAN,
+      g_cclosure_marshal_generic,
       G_TYPE_NONE,
       2, EMPATHY_TYPE_CALL_HANDLER, G_TYPE_BOOLEAN);
 
@@ -150,7 +149,7 @@ empathy_call_factory_class_init (EmpathyCallFactoryClass *klass)
       G_TYPE_FROM_CLASS (klass),
       G_SIGNAL_RUN_LAST, 0,
       NULL, NULL,
-      _src_marshal_BOOLEAN__UINT_OBJECT_OBJECT_OBJECT,
+      g_cclosure_marshal_generic,
       G_TYPE_BOOLEAN,
       4, G_TYPE_UINT, TPY_TYPE_CALL_CHANNEL,
       TP_TYPE_CHANNEL_DISPATCH_OPERATION,
diff --git a/src/empathy-call-handler.c b/src/empathy-call-handler.c
index cf93a1de3..9fe89337d 100644
--- a/src/empathy-call-handler.c
+++ b/src/empathy-call-handler.c
@@ -36,7 +36,6 @@
 #include <libempathy-gtk/empathy-call-utils.h>
 
 #include "empathy-call-handler.h"
-#include "src-marshal.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_VOIP
 #include <libempathy/empathy-debug.h>
@@ -457,55 +456,55 @@ empathy_call_handler_class_init (EmpathyCallHandlerClass *klass)
   signals[CONFERENCE_ADDED] =
     g_signal_new ("conference-added", G_TYPE_FROM_CLASS (klass),
       G_SIGNAL_RUN_LAST, 0, NULL, NULL,
-      g_cclosure_marshal_VOID__OBJECT,
+      g_cclosure_marshal_generic,
       G_TYPE_NONE,
       1, FS_TYPE_CONFERENCE);
 
   signals[CONFERENCE_REMOVED] =
     g_signal_new ("conference-removed", G_TYPE_FROM_CLASS (klass),
       G_SIGNAL_RUN_LAST, 0, NULL, NULL,
-      g_cclosure_marshal_VOID__OBJECT,
+      g_cclosure_marshal_generic,
       G_TYPE_NONE,
       1, FS_TYPE_CONFERENCE);
 
   signals[SRC_PAD_ADDED] =
     g_signal_new ("src-pad-added", G_TYPE_FROM_CLASS (klass),
       G_SIGNAL_RUN_LAST, 0, NULL, NULL,
-      _src_marshal_BOOLEAN__OBJECT_UINT,
+      g_cclosure_marshal_generic,
       G_TYPE_BOOLEAN,
       2, GST_TYPE_PAD, G_TYPE_UINT);
 
   signals[SINK_PAD_ADDED] =
     g_signal_new ("sink-pad-added", G_TYPE_FROM_CLASS (klass),
       G_SIGNAL_RUN_LAST, 0, NULL, NULL,
-      _src_marshal_BOOLEAN__OBJECT_UINT,
+      g_cclosure_marshal_generic,
       G_TYPE_BOOLEAN,
       2, GST_TYPE_PAD, G_TYPE_UINT);
 
   signals[SINK_PAD_REMOVED] =
     g_signal_new ("sink-pad-removed", G_TYPE_FROM_CLASS (klass),
       G_SIGNAL_RUN_LAST, 0, NULL, NULL,
-      _src_marshal_BOOLEAN__OBJECT_UINT,
+      g_cclosure_marshal_generic,
       G_TYPE_BOOLEAN,
       2, GST_TYPE_PAD, G_TYPE_UINT);
 
   signals[CLOSED] =
     g_signal_new ("closed", G_TYPE_FROM_CLASS (klass),
       G_SIGNAL_RUN_LAST, 0, NULL, NULL,
-      g_cclosure_marshal_VOID__VOID,
+      g_cclosure_marshal_generic,
       G_TYPE_NONE,
       0);
 
   signals[CANDIDATES_CHANGED] =
     g_signal_new ("candidates-changed", G_TYPE_FROM_CLASS (klass),
       G_SIGNAL_RUN_LAST, 0, NULL, NULL,
-      g_cclosure_marshal_VOID__UINT,
+      g_cclosure_marshal_generic,
       G_TYPE_NONE, 1, G_TYPE_UINT);
 
   signals[STATE_CHANGED] =
     g_signal_new ("state-changed", G_TYPE_FROM_CLASS (klass),
       G_SIGNAL_RUN_LAST, 0, NULL, NULL,
-      g_cclosure_marshal_VOID__UINT,
+      g_cclosure_marshal_generic,
       G_TYPE_NONE, 1, G_TYPE_UINT);
 }
 
diff --git a/src/empathy-chat-manager.c b/src/empathy-chat-manager.c
index 0e1745edb..7f37cc5c4 100644
--- a/src/empathy-chat-manager.c
+++ b/src/empathy-chat-manager.c
@@ -349,7 +349,7 @@ empathy_chat_manager_class_init (
         G_SIGNAL_RUN_LAST,
         0,
         NULL, NULL,
-        g_cclosure_marshal_VOID__UINT,
+        g_cclosure_marshal_generic,
         G_TYPE_NONE,
         1, G_TYPE_UINT, NULL);
 
@@ -359,7 +359,7 @@ empathy_chat_manager_class_init (
         G_SIGNAL_RUN_LAST,
         0,
         NULL, NULL,
-        g_cclosure_marshal_VOID__UINT,
+        g_cclosure_marshal_generic,
         G_TYPE_NONE,
         1, G_TYPE_UINT, NULL);
 
diff --git a/src/empathy-event-manager.c b/src/empathy-event-manager.c
index 1e22aa053..79b1f60cb 100644
--- a/src/empathy-event-manager.c
+++ b/src/empathy-event-manager.c
@@ -1339,7 +1339,7 @@ empathy_event_manager_class_init (EmpathyEventManagerClass *klass)
       G_SIGNAL_RUN_LAST,
       0,
       NULL, NULL,
-      g_cclosure_marshal_VOID__POINTER,
+      g_cclosure_marshal_generic,
       G_TYPE_NONE,
       1, G_TYPE_POINTER);
 
@@ -1349,7 +1349,7 @@ empathy_event_manager_class_init (EmpathyEventManagerClass *klass)
       G_SIGNAL_RUN_LAST,
       0,
       NULL, NULL,
-      g_cclosure_marshal_VOID__POINTER,
+      g_cclosure_marshal_generic,
       G_TYPE_NONE, 1, G_TYPE_POINTER);
 
   signals[EVENT_UPDATED] =
@@ -1358,7 +1358,7 @@ empathy_event_manager_class_init (EmpathyEventManagerClass *klass)
       G_SIGNAL_RUN_LAST,
       0,
       NULL, NULL,
-      g_cclosure_marshal_VOID__POINTER,
+      g_cclosure_marshal_generic,
       G_TYPE_NONE, 1, G_TYPE_POINTER);
 
   g_type_class_add_private (object_class, sizeof (EmpathyEventManagerPriv));
diff --git a/src/empathy-mic-monitor.c b/src/empathy-mic-monitor.c
index 1628828e0..29d2d3a3d 100644
--- a/src/empathy-mic-monitor.c
+++ b/src/empathy-mic-monitor.c
@@ -26,7 +26,6 @@
 
 #include "empathy-mic-monitor.h"
 
-#include "src-marshal.h"
 
 #include <libempathy/empathy-utils.h>
 
@@ -268,7 +267,7 @@ empathy_mic_monitor_class_init (EmpathyMicMonitorClass *klass)
     G_SIGNAL_RUN_LAST,
     0,
     NULL, NULL,
-    _src_marshal_VOID__UINT_STRING_STRING_BOOLEAN,
+    g_cclosure_marshal_generic,
     G_TYPE_NONE, 4, G_TYPE_UINT, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_BOOLEAN);
 
   signals[MICROPHONE_REMOVED] = g_signal_new ("microphone-removed",
@@ -276,7 +275,7 @@ empathy_mic_monitor_class_init (EmpathyMicMonitorClass *klass)
     G_SIGNAL_RUN_LAST,
     0,
     NULL, NULL,
-    g_cclosure_marshal_VOID__UINT,
+    g_cclosure_marshal_generic,
     G_TYPE_NONE, 1, G_TYPE_UINT);
 
   signals[MICROPHONE_CHANGED] = g_signal_new ("microphone-changed",
@@ -284,7 +283,7 @@ empathy_mic_monitor_class_init (EmpathyMicMonitorClass *klass)
     G_SIGNAL_RUN_LAST,
     0,
     NULL, NULL,
-    _src_marshal_VOID__UINT_UINT,
+    g_cclosure_marshal_generic,
     G_TYPE_NONE, 2, G_TYPE_UINT, G_TYPE_UINT);
 
   g_type_class_add_private (object_class, sizeof (EmpathyMicMonitorPrivate));
diff --git a/src/empathy-streamed-media-factory.c b/src/empathy-streamed-media-factory.c
index 9ef5da5e1..1c25ae253 100644
--- a/src/empathy-streamed-media-factory.c
+++ b/src/empathy-streamed-media-factory.c
@@ -32,7 +32,6 @@
 
 #include "empathy-streamed-media-factory.h"
 #include "empathy-streamed-media-handler.h"
-#include "src-marshal.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_VOIP
 #include <libempathy/empathy-debug.h>
@@ -166,7 +165,7 @@ empathy_streamed_media_factory_class_init (
       G_TYPE_FROM_CLASS (empathy_streamed_media_factory_class),
       G_SIGNAL_RUN_LAST, 0,
       NULL, NULL,
-      _src_marshal_VOID__OBJECT_BOOLEAN,
+      g_cclosure_marshal_generic,
       G_TYPE_NONE,
       2, EMPATHY_TYPE_STREAMED_MEDIA_HANDLER, G_TYPE_BOOLEAN);
 }
diff --git a/src/empathy-streamed-media-handler.c b/src/empathy-streamed-media-handler.c
index 39e3e560d..67527d8e4 100644
--- a/src/empathy-streamed-media-handler.c
+++ b/src/empathy-streamed-media-handler.c
@@ -34,7 +34,6 @@
 #include <libempathy-gtk/empathy-call-utils.h>
 
 #include "empathy-streamed-media-handler.h"
-#include "src-marshal.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_VOIP
 #include <libempathy/empathy-debug.h>
@@ -342,21 +341,21 @@ empathy_streamed_media_handler_class_init (EmpathyStreamedMediaHandlerClass *kla
   signals[CONFERENCE_ADDED] =
     g_signal_new ("conference-added", G_TYPE_FROM_CLASS (klass),
       G_SIGNAL_RUN_LAST, 0, NULL, NULL,
-      g_cclosure_marshal_VOID__OBJECT,
+      g_cclosure_marshal_generic,
       G_TYPE_NONE,
       1, FS_TYPE_CONFERENCE);
 
   signals[SRC_PAD_ADDED] =
     g_signal_new ("src-pad-added", G_TYPE_FROM_CLASS (klass),
       G_SIGNAL_RUN_LAST, 0, NULL, NULL,
-      _src_marshal_BOOLEAN__OBJECT_UINT,
+      g_cclosure_marshal_generic,
       G_TYPE_BOOLEAN,
       2, GST_TYPE_PAD, G_TYPE_UINT);
 
   signals[SINK_PAD_ADDED] =
     g_signal_new ("sink-pad-added", G_TYPE_FROM_CLASS (klass),
       G_SIGNAL_RUN_LAST, 0, NULL, NULL,
-      _src_marshal_BOOLEAN__OBJECT_UINT,
+      g_cclosure_marshal_generic,
       G_TYPE_BOOLEAN,
       2, GST_TYPE_PAD, G_TYPE_UINT);
 
@@ -364,26 +363,26 @@ empathy_streamed_media_handler_class_init (EmpathyStreamedMediaHandlerClass *kla
     g_signal_new ("request-resource", G_TYPE_FROM_CLASS (klass),
       G_SIGNAL_RUN_LAST, 0,
       g_signal_accumulator_true_handled, NULL,
-      _src_marshal_BOOLEAN__UINT_UINT,
+      g_cclosure_marshal_generic,
       G_TYPE_BOOLEAN, 2, G_TYPE_UINT, G_TYPE_UINT);
 
   signals[CLOSED] =
     g_signal_new ("closed", G_TYPE_FROM_CLASS (klass),
       G_SIGNAL_RUN_LAST, 0, NULL, NULL,
-      g_cclosure_marshal_VOID__VOID,
+      g_cclosure_marshal_generic,
       G_TYPE_NONE,
       0);
 
   signals[STREAM_CLOSED] =
     g_signal_new ("stream-closed", G_TYPE_FROM_CLASS (klass),
       G_SIGNAL_RUN_LAST, 0, NULL, NULL,
-      g_cclosure_marshal_VOID__OBJECT,
+      g_cclosure_marshal_generic,
       G_TYPE_NONE, 1, TF_TYPE_STREAM);
 
   signals[CANDIDATES_CHANGED] =
     g_signal_new ("candidates-changed", G_TYPE_FROM_CLASS (klass),
       G_SIGNAL_RUN_LAST, 0, NULL, NULL,
-      g_cclosure_marshal_VOID__UINT,
+      g_cclosure_marshal_generic,
       G_TYPE_NONE, 1, G_TYPE_UINT);
 }
 
diff --git a/src/ev-sidebar.c b/src/ev-sidebar.c
index 56e5cf982..1d0b2df2f 100644
--- a/src/ev-sidebar.c
+++ b/src/ev-sidebar.c
@@ -76,7 +76,7 @@ ev_sidebar_class_init (EvSidebarClass *ev_sidebar_class)
 				G_SIGNAL_RUN_LAST,
 				G_STRUCT_OFFSET (EvSidebarClass, closed),
 				NULL, NULL,
-				g_cclosure_marshal_VOID__VOID,
+				g_cclosure_marshal_generic,
 				G_TYPE_NONE, 0);
 
 	ev_sidebar_table_signals[CHANGED] =
@@ -85,7 +85,7 @@ ev_sidebar_class_init (EvSidebarClass *ev_sidebar_class)
 				G_SIGNAL_RUN_LAST,
 				G_STRUCT_OFFSET (EvSidebarClass, closed),
 				NULL, NULL,
-				g_cclosure_marshal_VOID__STRING,
+				g_cclosure_marshal_generic,
 				G_TYPE_NONE, 1, G_TYPE_STRING);
 
 }