aboutsummaryrefslogtreecommitdiffstats
path: root/libempathy/empathy-tp-chat.c
diff options
context:
space:
mode:
authorDanielle Madeley <danielle.madeley@collabora.co.uk>2011-04-12 07:43:36 +0800
committerDanielle Madeley <danielle.madeley@collabora.co.uk>2011-04-12 07:43:36 +0800
commit4a6c023d435bf3346e5232ef835770cbbe2499ab (patch)
treee9cd71cf44fa3af8b910a8a57ad860084037e5d6 /libempathy/empathy-tp-chat.c
parente702ff444130b055249fde571d6532931a31e47e (diff)
downloadgsoc2013-empathy-4a6c023d435bf3346e5232ef835770cbbe2499ab.tar
gsoc2013-empathy-4a6c023d435bf3346e5232ef835770cbbe2499ab.tar.gz
gsoc2013-empathy-4a6c023d435bf3346e5232ef835770cbbe2499ab.tar.bz2
gsoc2013-empathy-4a6c023d435bf3346e5232ef835770cbbe2499ab.tar.lz
gsoc2013-empathy-4a6c023d435bf3346e5232ef835770cbbe2499ab.tar.xz
gsoc2013-empathy-4a6c023d435bf3346e5232ef835770cbbe2499ab.tar.zst
gsoc2013-empathy-4a6c023d435bf3346e5232ef835770cbbe2499ab.zip
Don't wait for SMS properties when there is no SMS support on the channel
Diffstat (limited to 'libempathy/empathy-tp-chat.c')
-rw-r--r--libempathy/empathy-tp-chat.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/libempathy/empathy-tp-chat.c b/libempathy/empathy-tp-chat.c
index 7f1a0dd43..da3ac663a 100644
--- a/libempathy/empathy-tp-chat.c
+++ b/libempathy/empathy-tp-chat.c
@@ -1415,6 +1415,9 @@ tp_chat_constructor (GType type,
tp_cli_dbus_properties_call_get (priv->channel, -1,
TP_IFACE_CHANNEL_INTERFACE_SMS, "SMSChannel",
get_sms_channel_cb, chat, NULL, G_OBJECT (chat));
+ } else {
+ /* if there's no SMS support, then we're not waiting for it */
+ priv->got_sms_channel = TRUE;
}
return chat;