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/proxy.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/proxy.c')
| -rw-r--r-- | telepathy-glib/proxy.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/telepathy-glib/proxy.c b/telepathy-glib/proxy.c index 4f74efd97..60a0b4946 100644 --- a/telepathy-glib/proxy.c +++ b/telepathy-glib/proxy.c @@ -36,8 +36,6 @@ #include "simple-client-factory-internal.h" #include "util-internal.h" -#include "_gen/signals-marshal.h" - #include "_gen/tp-cli-generic-body.h" #if 0 @@ -1366,8 +1364,7 @@ tp_proxy_class_init (TpProxyClass *klass) G_OBJECT_CLASS_TYPE (klass), G_SIGNAL_RUN_LAST | G_SIGNAL_DETAILED, 0, - NULL, NULL, - _tp_marshal_VOID__UINT_OBJECT, + NULL, NULL, NULL, G_TYPE_NONE, 2, G_TYPE_UINT, DBUS_TYPE_G_PROXY); /** @@ -1392,8 +1389,7 @@ tp_proxy_class_init (TpProxyClass *klass) G_OBJECT_CLASS_TYPE (klass), G_SIGNAL_RUN_LAST | G_SIGNAL_DETAILED, 0, - NULL, NULL, - _tp_marshal_VOID__UINT_INT_STRING, + NULL, NULL, NULL, G_TYPE_NONE, 3, G_TYPE_UINT, G_TYPE_INT, G_TYPE_STRING); } |