From 2411c0bc8accdfe6ff38cca5510c79f0f56abd8f Mon Sep 17 00:00:00 2001
From: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date: Tue, 12 Apr 2011 09:43:36 +1000
Subject: Don't wait for SMS properties when there is no SMS support on the
 channel

---
 libempathy/empathy-tp-chat.c | 3 +++
 1 file changed, 3 insertions(+)

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;
-- 
cgit v1.2.3