aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2011-04-15 18:21:52 +0800
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2011-04-18 19:09:48 +0800
commitddcc4fc3969c7eb60af1a298a8619d1bb0359a83 (patch)
tree8569646dd304e2ad081fd168e660e2088319aef3 /src
parent5d64d93d3b713a474b56610f38c4fcbb9612c02e (diff)
downloadgsoc2013-empathy-ddcc4fc3969c7eb60af1a298a8619d1bb0359a83.tar
gsoc2013-empathy-ddcc4fc3969c7eb60af1a298a8619d1bb0359a83.tar.gz
gsoc2013-empathy-ddcc4fc3969c7eb60af1a298a8619d1bb0359a83.tar.bz2
gsoc2013-empathy-ddcc4fc3969c7eb60af1a298a8619d1bb0359a83.tar.lz
gsoc2013-empathy-ddcc4fc3969c7eb60af1a298a8619d1bb0359a83.tar.xz
gsoc2013-empathy-ddcc4fc3969c7eb60af1a298a8619d1bb0359a83.tar.zst
gsoc2013-empathy-ddcc4fc3969c7eb60af1a298a8619d1bb0359a83.zip
empathy-tp-chat: ensure that we get a TpTextChannel
Diffstat (limited to 'src')
-rw-r--r--src/empathy-chat-manager.c7
-rw-r--r--src/empathy-event-manager.c2
2 files changed, 8 insertions, 1 deletions
diff --git a/src/empathy-chat-manager.c b/src/empathy-chat-manager.c
index ff715fe37..6c92c25cb 100644
--- a/src/empathy-chat-manager.c
+++ b/src/empathy-chat-manager.c
@@ -231,6 +231,13 @@ handle_channels (TpSimpleHandler *handler,
if (tp_proxy_get_invalidated (channel) != NULL)
continue;
+ if (!TP_IS_TEXT_CHANNEL (channel))
+ {
+ DEBUG ("Channel %s doesn't implement Messages; can't handle it",
+ tp_proxy_get_object_path (channel));
+ continue;
+ }
+
handling = TRUE;
tp_chat = empathy_tp_chat_new (account, channel);
diff --git a/src/empathy-event-manager.c b/src/empathy-event-manager.c
index 342d3e11e..6125ec895 100644
--- a/src/empathy-event-manager.c
+++ b/src/empathy-event-manager.c
@@ -934,7 +934,7 @@ approve_channels (TpSimpleApprover *approver,
channel_type = tp_channel_get_channel_type_id (channel);
- if (channel_type == TP_IFACE_QUARK_CHANNEL_TYPE_TEXT)
+ if (TP_IS_TEXT_CHANNEL (channel))
{
EmpathyTpChat *tp_chat;