summaryrefslogtreecommitdiff
path: root/telepathy-glib/account.c
diff options
context:
space:
mode:
authorSimon McVittie <simon.mcvittie@collabora.co.uk>2012-02-23 15:31:36 +0000
committerSimon McVittie <simon.mcvittie@collabora.co.uk>2012-03-01 14:54:59 +0000
commita7f5ea03fd6b09a8a3c4c3a63a85d0d9932bf11d (patch)
tree25c9ed72a83845d4a2386a9757057bbc005853d2 /telepathy-glib/account.c
parent1eee3b6d61e52c5bf23128236c9f8f931f5ea033 (diff)
downloadtelepathy-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/account.c')
-rw-r--r--telepathy-glib/account.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/telepathy-glib/account.c b/telepathy-glib/account.c
index f012fe9a1..455f8c1e0 100644
--- a/telepathy-glib/account.c
+++ b/telepathy-glib/account.c
@@ -41,7 +41,6 @@
#include "telepathy-glib/simple-client-factory-internal.h"
#include <telepathy-glib/util-internal.h>
-#include "telepathy-glib/_gen/signals-marshal.h"
#include "telepathy-glib/_gen/tp-cli-account-body.h"
/**
@@ -1956,8 +1955,7 @@ tp_account_class_init (TpAccountClass *klass)
signals[STATUS_CHANGED] = g_signal_new ("status-changed",
G_TYPE_FROM_CLASS (object_class),
G_SIGNAL_RUN_LAST,
- 0, NULL, NULL,
- _tp_marshal_VOID__UINT_UINT_UINT_STRING_BOXED,
+ 0, NULL, NULL, NULL,
G_TYPE_NONE, 5, G_TYPE_UINT, G_TYPE_UINT, G_TYPE_UINT, G_TYPE_STRING,
G_TYPE_HASH_TABLE);
@@ -1975,8 +1973,7 @@ tp_account_class_init (TpAccountClass *klass)
signals[PRESENCE_CHANGED] = g_signal_new ("presence-changed",
G_TYPE_FROM_CLASS (object_class),
G_SIGNAL_RUN_LAST,
- 0, NULL, NULL,
- _tp_marshal_VOID__UINT_STRING_STRING,
+ 0, NULL, NULL, NULL,
G_TYPE_NONE, 3, G_TYPE_UINT, G_TYPE_STRING, G_TYPE_STRING);
proxy_class->interface = TP_IFACE_QUARK_ACCOUNT;