diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2012-02-23 15:31:36 +0000 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2012-03-01 14:54:59 +0000 |
| commit | a7f5ea03fd6b09a8a3c4c3a63a85d0d9932bf11d (patch) | |
| tree | 25c9ed72a83845d4a2386a9757057bbc005853d2 /telepathy-glib/call-content.c | |
| parent | 1eee3b6d61e52c5bf23128236c9f8f931f5ea033 (diff) | |
| download | telepathy-glib-a7f5ea03fd6b09a8a3c4c3a63a85d0d9932bf11d.tar.gz | |
Use GLib's default marshaller everywhere
In contrast to the previous commit, I'm just using NULL here -
telepathy-glib has an explicit dependency on GLib 2.30.
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=46523
Reviewed-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
Diffstat (limited to 'telepathy-glib/call-content.c')
| -rw-r--r-- | telepathy-glib/call-content.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/telepathy-glib/call-content.c b/telepathy-glib/call-content.c index c464371c4..8ad6114bc 100644 --- a/telepathy-glib/call-content.c +++ b/telepathy-glib/call-content.c @@ -63,7 +63,6 @@ #include "telepathy-glib/call-internal.h" #include "telepathy-glib/proxy-internal.h" #include "telepathy-glib/util-internal.h" -#include "telepathy-glib/_gen/signals-marshal.h" #include "_gen/tp-cli-call-content-body.h" @@ -639,8 +638,7 @@ tp_call_content_class_init (TpCallContentClass *klass) _signals[REMOVED] = g_signal_new ("removed", G_OBJECT_CLASS_TYPE (klass), G_SIGNAL_RUN_LAST, - 0, NULL, NULL, - g_cclosure_marshal_VOID__VOID, + 0, NULL, NULL, NULL, G_TYPE_NONE, 0); @@ -661,8 +659,7 @@ tp_call_content_class_init (TpCallContentClass *klass) _signals[STREAMS_ADDED] = g_signal_new ("streams-added", G_OBJECT_CLASS_TYPE (klass), G_SIGNAL_RUN_LAST, - 0, NULL, NULL, - g_cclosure_marshal_VOID__BOXED, + 0, NULL, NULL, NULL, G_TYPE_NONE, 1, G_TYPE_PTR_ARRAY); @@ -684,8 +681,7 @@ tp_call_content_class_init (TpCallContentClass *klass) _signals[STREAMS_REMOVED] = g_signal_new ("streams-removed", G_OBJECT_CLASS_TYPE (klass), G_SIGNAL_RUN_LAST, - 0, NULL, NULL, - _tp_marshal_VOID__BOXED_BOXED, + 0, NULL, NULL, NULL, G_TYPE_NONE, 2, G_TYPE_PTR_ARRAY, TP_TYPE_CALL_STATE_REASON); |