summaryrefslogtreecommitdiff
path: root/telepathy-glib/base-password-channel.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/base-password-channel.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/base-password-channel.c')
-rw-r--r--telepathy-glib/base-password-channel.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/telepathy-glib/base-password-channel.c b/telepathy-glib/base-password-channel.c
index f2c054e24..6e3b53288 100644
--- a/telepathy-glib/base-password-channel.c
+++ b/telepathy-glib/base-password-channel.c
@@ -65,8 +65,6 @@
#define DEBUG_FLAG TP_DEBUG_SASL
#include "telepathy-glib/debug-internal.h"
-#include "telepathy-glib/_gen/signals-marshal.h"
-
static void sasl_auth_iface_init (gpointer g_iface, gpointer iface_data);
G_DEFINE_TYPE_WITH_CODE (TpBasePasswordChannel, tp_base_password_channel,
@@ -405,8 +403,7 @@ tp_base_password_channel_class_init (TpBasePasswordChannelClass *tp_base_passwor
G_TYPE_FROM_CLASS (object_class),
G_SIGNAL_RUN_LAST,
0,
- NULL, NULL,
- _tp_marshal_VOID__BOXED_UINT_INT_STRING,
+ NULL, NULL, NULL,
G_TYPE_NONE, 4,
G_TYPE_GSTRING, G_TYPE_UINT, G_TYPE_INT, G_TYPE_STRING);