diff options
| author | Danielle Madeley <danielle.madeley@collabora.co.uk> | 2011-04-12 19:06:19 +0800 |
|---|---|---|
| committer | Danielle Madeley <danielle.madeley@collabora.co.uk> | 2011-04-12 19:06:19 +0800 |
| commit | bc49c0faa6ac399c97e98631dd8177d6324b0161 (patch) | |
| tree | c46a2e9f0609ee67d2fa34335b992d57f5027d4b | |
| parent | 14c784281eca531135cc07009fb6d4a463d04ac2 (diff) | |
| parent | 4a6c023d435bf3346e5232ef835770cbbe2499ab (diff) | |
| download | gsoc2013-empathy-bc49c0faa6ac399c97e98631dd8177d6324b0161.tar gsoc2013-empathy-bc49c0faa6ac399c97e98631dd8177d6324b0161.tar.gz gsoc2013-empathy-bc49c0faa6ac399c97e98631dd8177d6324b0161.tar.bz2 gsoc2013-empathy-bc49c0faa6ac399c97e98631dd8177d6324b0161.tar.lz gsoc2013-empathy-bc49c0faa6ac399c97e98631dd8177d6324b0161.tar.xz gsoc2013-empathy-bc49c0faa6ac399c97e98631dd8177d6324b0161.tar.zst gsoc2013-empathy-bc49c0faa6ac399c97e98631dd8177d6324b0161.zip | |
Merge branch 'sms-support' into empathy-skype
| -rw-r--r-- | libempathy/empathy-tp-chat.c | 3 |
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; |