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/account-manager.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/account-manager.c')
| -rw-r--r-- | telepathy-glib/account-manager.c | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/telepathy-glib/account-manager.c b/telepathy-glib/account-manager.c index 3cb499d81..231223437 100644 --- a/telepathy-glib/account-manager.c +++ b/telepathy-glib/account-manager.c @@ -32,7 +32,6 @@ #include <telepathy-glib/util.h> #include "telepathy-glib/account-manager.h" -#include "telepathy-glib/_gen/signals-marshal.h" #define DEBUG_FLAG TP_DEBUG_ACCOUNTS #include "telepathy-glib/dbus-internal.h" @@ -600,8 +599,7 @@ tp_account_manager_class_init (TpAccountManagerClass *klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, 0, - NULL, NULL, - _tp_marshal_VOID__OBJECT_BOOLEAN, + NULL, NULL, NULL, G_TYPE_NONE, 2, TP_TYPE_ACCOUNT, G_TYPE_BOOLEAN); @@ -618,8 +616,7 @@ tp_account_manager_class_init (TpAccountManagerClass *klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, 0, - NULL, NULL, - g_cclosure_marshal_VOID__OBJECT, + NULL, NULL, NULL, G_TYPE_NONE, 1, TP_TYPE_ACCOUNT); @@ -640,8 +637,7 @@ tp_account_manager_class_init (TpAccountManagerClass *klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, 0, - NULL, NULL, - g_cclosure_marshal_VOID__OBJECT, + NULL, NULL, NULL, G_TYPE_NONE, 1, TP_TYPE_ACCOUNT); @@ -658,8 +654,7 @@ tp_account_manager_class_init (TpAccountManagerClass *klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, 0, - NULL, NULL, - g_cclosure_marshal_VOID__OBJECT, + NULL, NULL, NULL, G_TYPE_NONE, 1, TP_TYPE_ACCOUNT); @@ -679,8 +674,7 @@ tp_account_manager_class_init (TpAccountManagerClass *klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, 0, - NULL, NULL, - _tp_marshal_VOID__UINT_STRING_STRING, + NULL, NULL, NULL, G_TYPE_NONE, 3, G_TYPE_UINT, /* Presence type */ G_TYPE_STRING, /* status */ |