diff options
| author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2011-06-08 17:43:59 +0800 |
|---|---|---|
| committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2011-06-08 17:43:59 +0800 |
| commit | f63939a4648a0ebd64a2ff1468a72036adadb581 (patch) | |
| tree | d549cc40eca75394d8654c62f3434bd157fe147e /libempathy-gtk | |
| parent | a5656bd2eb7a3ff272726e898a0a81462eb438fa (diff) | |
| parent | eaf1ecca8c31263cef90bfbb4839e7114719eed8 (diff) | |
| download | gsoc2013-empathy-f63939a4648a0ebd64a2ff1468a72036adadb581.tar gsoc2013-empathy-f63939a4648a0ebd64a2ff1468a72036adadb581.tar.gz gsoc2013-empathy-f63939a4648a0ebd64a2ff1468a72036adadb581.tar.bz2 gsoc2013-empathy-f63939a4648a0ebd64a2ff1468a72036adadb581.tar.lz gsoc2013-empathy-f63939a4648a0ebd64a2ff1468a72036adadb581.tar.xz gsoc2013-empathy-f63939a4648a0ebd64a2ff1468a72036adadb581.tar.zst gsoc2013-empathy-f63939a4648a0ebd64a2ff1468a72036adadb581.zip | |
Merge branch 'sms-651242'
Diffstat (limited to 'libempathy-gtk')
| -rw-r--r-- | libempathy-gtk/empathy-chat.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libempathy-gtk/empathy-chat.c b/libempathy-gtk/empathy-chat.c index 74ee8ec96..3c391c864 100644 --- a/libempathy-gtk/empathy-chat.c +++ b/libempathy-gtk/empathy-chat.c @@ -3642,7 +3642,8 @@ chat_sms_channel_changed_cb (EmpathyChat *self) { EmpathyChatPriv *priv = GET_PRIV (self); - priv->sms_channel = empathy_tp_chat_is_sms_channel (priv->tp_chat); + priv->sms_channel = tp_text_channel_is_sms_channel ( + (TpTextChannel *) priv->tp_chat); g_object_notify (G_OBJECT (self), "sms-channel"); } @@ -3703,7 +3704,7 @@ empathy_chat_set_tp_chat (EmpathyChat *chat, g_signal_connect_swapped (tp_chat, "notify::password-needed", G_CALLBACK (chat_password_needed_changed_cb), chat); - g_signal_connect_swapped (tp_chat, "notify::sms-channel", + g_signal_connect_swapped (tp_chat, "notify::is-sms-channel", G_CALLBACK (chat_sms_channel_changed_cb), chat); g_signal_connect_swapped (tp_chat, "notify::n-messages-sending", |