|
 |
6ab996 |
From daeb37137604edb60ae86526a0a387ed2b1962f1 Mon Sep 17 00:00:00 2001
|
|
|
6ab996 |
From: Debarshi Ray <debarshir@gnome.org>
|
|
|
6ab996 |
Date: Fri, 1 Nov 2013 11:12:06 +0100
|
|
|
6ab996 |
Subject: [PATCH] protocol-chooser: skip Haze's IRC implementation
|
|
|
6ab996 |
|
|
|
6ab996 |
Users should be using Idle for IRC, and not Haze. This is implicitly
|
|
|
6ab996 |
codified in the widgets array kept in empathy-account-widget.c.
|
|
|
6ab996 |
Otherwise, if Idle is absent we would still be advertising IRC support
|
|
|
6ab996 |
in the UI, only to crash immediately afterwards.
|
|
|
6ab996 |
|
|
|
6ab996 |
All said and done, it is saner to support one single implementation of
|
|
|
6ab996 |
a protocol.
|
|
|
6ab996 |
|
|
|
6ab996 |
https://bugzilla.gnome.org/show_bug.cgi?id=711226
|
|
|
6ab996 |
---
|
|
|
6ab996 |
libempathy-gtk/empathy-protocol-chooser.c | 5 +++++
|
|
|
6ab996 |
1 file changed, 5 insertions(+)
|
|
|
6ab996 |
|
|
|
6ab996 |
diff --git a/libempathy-gtk/empathy-protocol-chooser.c b/libempathy-gtk/empathy-protocol-chooser.c
|
|
|
6ab996 |
index d5b0de7..ec7d125 100644
|
|
|
6ab996 |
--- a/libempathy-gtk/empathy-protocol-chooser.c
|
|
|
6ab996 |
+++ b/libempathy-gtk/empathy-protocol-chooser.c
|
|
|
6ab996 |
@@ -182,6 +182,11 @@ protocol_choosers_add_cm (EmpathyProtocolChooser *chooser,
|
|
|
6ab996 |
continue;
|
|
|
6ab996 |
|
|
|
6ab996 |
if (!tp_strdiff (cm_name, "haze") &&
|
|
|
6ab996 |
+ !tp_strdiff (proto_name, "irc"))
|
|
|
6ab996 |
+ /* Use Idle for IRC (bgo #711226) */
|
|
|
6ab996 |
+ continue;
|
|
|
6ab996 |
+
|
|
|
6ab996 |
+ if (!tp_strdiff (cm_name, "haze") &&
|
|
|
6ab996 |
!tp_strdiff (proto_name, "sip"))
|
|
|
6ab996 |
/* Haze's SIP implementation is pretty useless (bgo #629736) */
|
|
|
6ab996 |
continue;
|
|
|
6ab996 |
--
|
|
|
6ab996 |
1.8.3.1
|
|
|
6ab996 |
|