aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2010-02-11 18:57:16 +0800
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2010-02-12 00:01:37 +0800
commit90480686db5a6f52b29abc6b9294428a347511da (patch)
tree87c3029e448dd72bfc693bc9851ae8cb3914f604
parent894061fd27c27db5026c8d90bdb72339223f1798 (diff)
downloadgsoc2013-empathy-90480686db5a6f52b29abc6b9294428a347511da.tar
gsoc2013-empathy-90480686db5a6f52b29abc6b9294428a347511da.tar.gz
gsoc2013-empathy-90480686db5a6f52b29abc6b9294428a347511da.tar.bz2
gsoc2013-empathy-90480686db5a6f52b29abc6b9294428a347511da.tar.lz
gsoc2013-empathy-90480686db5a6f52b29abc6b9294428a347511da.tar.xz
gsoc2013-empathy-90480686db5a6f52b29abc6b9294428a347511da.tar.zst
gsoc2013-empathy-90480686db5a6f52b29abc6b9294428a347511da.zip
Drop Haze's facebook implementation
Everyone should use Gabble now.
-rw-r--r--libempathy-gtk/empathy-protocol-chooser.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/libempathy-gtk/empathy-protocol-chooser.c b/libempathy-gtk/empathy-protocol-chooser.c
index 0bbcd5127..c2a159c9f 100644
--- a/libempathy-gtk/empathy-protocol-chooser.c
+++ b/libempathy-gtk/empathy-protocol-chooser.c
@@ -167,6 +167,12 @@ protocol_choosers_add_cm (EmpathyProtocolChooser *chooser,
*/
continue;
+ if (!tp_strdiff (cm->name, "haze") &&
+ !tp_strdiff (proto->name, "facebook"))
+ /* Facebook now supports XMPP so drop the purple facebook plugin; user
+ * should use Gabble */
+ continue;
+
if (tp_strdiff (cm->name, "haze") && !tp_strdiff (saved_cm_name, "haze"))
{
GtkTreeIter titer;