aboutsummaryrefslogtreecommitdiffstats
path: root/libempathy
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-05-05 14:31:27 +0800
commit2411c0bc8accdfe6ff38cca5510c79f0f56abd8f (patch)
tree5cbbb4fd96f9473c21880026a094067323ecb2a4 /libempathy
parent8d16f171e0e256e0d8c954c7deb7c410e8e66465 (diff)
downloadgsoc2013-empathy-2411c0bc8accdfe6ff38cca5510c79f0f56abd8f.tar
gsoc2013-empathy-2411c0bc8accdfe6ff38cca5510c79f0f56abd8f.tar.gz
gsoc2013-empathy-2411c0bc8accdfe6ff38cca5510c79f0f56abd8f.tar.bz2
gsoc2013-empathy-2411c0bc8accdfe6ff38cca5510c79f0f56abd8f.tar.lz
gsoc2013-empathy-2411c0bc8accdfe6ff38cca5510c79f0f56abd8f.tar.xz
gsoc2013-empathy-2411c0bc8accdfe6ff38cca5510c79f0f56abd8f.tar.zst
gsoc2013-empathy-2411c0bc8accdfe6ff38cca5510c79f0f56abd8f.zip
Don't wait for SMS properties when there is no SMS support on the channel
Diffstat (limited to 'libempathy')
-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 946d576dd..b8e4cdf0c 100644
--- a/libempathy/empathy-tp-chat.c
+++ b/libempathy/empathy-tp-chat.c
@@ -1379,6 +1379,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;