From 3826d723545ab2ecb4f11dce9e0e1b48275516c3 Mon Sep 17 00:00:00 2001 From: Guillaume Desmottes Date: Fri, 11 Nov 2011 10:05:49 +0100 Subject: 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 --- libempathy-gtk/empathy-protocol-chooser.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'libempathy-gtk/empathy-protocol-chooser.c') 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; -- cgit v1.2.3