]> git.0d.be Git - empathy.git/commitdiff
Don't wait for SMS properties when there is no SMS support on the channel
authorDanielle Madeley <danielle.madeley@collabora.co.uk>
Mon, 11 Apr 2011 23:43:36 +0000 (09:43 +1000)
committerDanielle Madeley <danielle.madeley@collabora.co.uk>
Thu, 5 May 2011 06:31:27 +0000 (16:31 +1000)
libempathy/empathy-tp-chat.c

index 946d576dda2a49904178dd0a709850dfcadd047c..b8e4cdf0cf004d90c0006c9709d672a8f5158931 100644 (file)
@@ -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;