diff options
| author | Xavier Claessens <xclaesse@gmail.com> | 2011-09-28 19:41:11 +0800 |
|---|---|---|
| committer | Xavier Claessens <xclaesse@gmail.com> | 2011-09-28 20:03:54 +0800 |
| commit | 7978eacb5d49b518a7f7b4e7b92c8a7bfb8fc400 (patch) | |
| tree | 9a6a63fef4f7c6eadd7c67a807b85068e7f45986 /src/empathy-streamed-media-handler.c | |
| parent | 843f210c3bf26f6ecc93f90000e366ebc8296cc3 (diff) | |
| download | gsoc2013-empathy-7978eacb5d49b518a7f7b4e7b92c8a7bfb8fc400.tar gsoc2013-empathy-7978eacb5d49b518a7f7b4e7b92c8a7bfb8fc400.tar.gz gsoc2013-empathy-7978eacb5d49b518a7f7b4e7b92c8a7bfb8fc400.tar.bz2 gsoc2013-empathy-7978eacb5d49b518a7f7b4e7b92c8a7bfb8fc400.tar.lz gsoc2013-empathy-7978eacb5d49b518a7f7b4e7b92c8a7bfb8fc400.tar.xz gsoc2013-empathy-7978eacb5d49b518a7f7b4e7b92c8a7bfb8fc400.tar.zst gsoc2013-empathy-7978eacb5d49b518a7f7b4e7b92c8a7bfb8fc400.zip | |
Use g_cclosure_marshal_generic for all signals
No more ugly marshallers \o/
Diffstat (limited to 'src/empathy-streamed-media-handler.c')
| -rw-r--r-- | src/empathy-streamed-media-handler.c | 15 |
1 files changed, 7 insertions, 8 deletions
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); } |