summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon McVittie <simon.mcvittie@collabora.co.uk>2014-09-17 13:18:04 +0100
committerSimon McVittie <simon.mcvittie@collabora.co.uk>2014-09-17 13:18:04 +0100
commit2c40bd70beeb02ec0e394b6ca7ec3b17c97395a4 (patch)
tree04bd62f5c7b9a5ca71362c470d100600cf0270c5
parent8f96d1f2789e7644d5208a101f7ee98433852d81 (diff)
parent975b9d3e34c6a0f1a2d71be4e53493d3d6c1ca72 (diff)
downloadtelepathy-glib-2c40bd70beeb02ec0e394b6ca7ec3b17c97395a4.tar.gz
Merge remote-tracking branch 'cassidy/tartan+crash' into next
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk> Bug: https://bugs.freedesktop.org/show_bug.cgi?id=79361
-rw-r--r--examples/client/text-handler.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/examples/client/text-handler.c b/examples/client/text-handler.c
index 5577ad91b..25db0dfd4 100644
--- a/examples/client/text-handler.c
+++ b/examples/client/text-handler.c
@@ -85,16 +85,18 @@ handle_channel_cb (TpSimpleHandler *self,
TpHandleChannelContext *context,
gpointer user_data)
{
+ TpTextChannel *text_chan = TP_TEXT_CHANNEL (channel);
+
g_print ("Handling text channel with %s\n",
tp_channel_get_identifier (channel));
- g_signal_connect (channel, "message-received",
+ g_signal_connect (text_chan, "message-received",
G_CALLBACK (message_received_cb), NULL);
/* The default TpAutomaticClientFactory used by
* tp_account_manager_dup() has already prepared
* TP_TEXT_CHANNEL_FEATURE_INCOMING_MESSAGES, if possible. */
- display_pending_messages (TP_TEXT_CHANNEL (channel));
+ display_pending_messages (text_chan);
tp_handle_channel_context_accept (context);
}