aboutsummaryrefslogtreecommitdiffstats
path: root/libempathy-gtk
diff options
context:
space:
mode:
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2011-11-11 17:05:49 +0800
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2012-02-21 21:28:40 +0800
commit3826d723545ab2ecb4f11dce9e0e1b48275516c3 (patch)
treebe0b91d1ae848ac9b17696b32d468eed3a0163c0 /libempathy-gtk
parentdc044ffa0a35375738cd79c9508dfa766e2d1953 (diff)
downloadgsoc2013-empathy-3826d723545ab2ecb4f11dce9e0e1b48275516c3.tar
gsoc2013-empathy-3826d723545ab2ecb4f11dce9e0e1b48275516c3.tar.gz
gsoc2013-empathy-3826d723545ab2ecb4f11dce9e0e1b48275516c3.tar.bz2
gsoc2013-empathy-3826d723545ab2ecb4f11dce9e0e1b48275516c3.tar.lz
gsoc2013-empathy-3826d723545ab2ecb4f11dce9e0e1b48275516c3.tar.xz
gsoc2013-empathy-3826d723545ab2ecb4f11dce9e0e1b48275516c3.tar.zst
gsoc2013-empathy-3826d723545ab2ecb4f11dce9e0e1b48275516c3.zip
protocol-chooser: stop using Butterfly
It doesn't implement any modern Telepathy API like ContactList for example and we now rely on it. https://bugzilla.gnome.org/show_bug.cgi?id=663829
Diffstat (limited to 'libempathy-gtk')
-rw-r--r--libempathy-gtk/empathy-protocol-chooser.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/libempathy-gtk/empathy-protocol-chooser.c b/libempathy-gtk/empathy-protocol-chooser.c
index 216e4ffdb..7adacf472 100644
--- a/libempathy-gtk/empathy-protocol-chooser.c
+++ b/libempathy-gtk/empathy-protocol-chooser.c
@@ -184,6 +184,10 @@ protocol_choosers_add_cm (EmpathyProtocolChooser *chooser,
/* Haze's SIP implementation is pretty useless (bgo #629736) */
continue;
+ if (!tp_strdiff (cm->name, "butterfly"))
+ /* Butterfly isn't supported any more */
+ continue;
+
if (tp_strdiff (cm->name, "haze") && !tp_strdiff (saved_cm_name, "haze"))
{
GtkTreeIter titer;