summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDebarshi Ray <debarshir@gnome.org>2013-10-31 19:31:33 +0100
committerDebarshi Ray <debarshir@gnome.org>2013-11-01 11:07:42 +0100
commit5ffbe06ad7e3b86ada3871be2c0ee79468f3656b (patch)
treef5afe4cb69d53c6bd24190214b96b68f80bf787e
parentdd4ca5d4f3dcb590c5934cce9aeb266dd17ac51e (diff)
protocol: skip Haze's IRC implementation
Users should be using Idle for IRC, and not Haze. This is implicitly codified in the widgets array kept in tpaw-account-widget.c. Otherwise, if Idle is absent we would still be advertising IRC support in the UI, only to crash immediately afterwards. All said and done, it is saner to support one single implementation of a protocol. https://bugzilla.gnome.org/show_bug.cgi?id=711226
-rw-r--r--tp-account-widgets/tpaw-protocol.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/tp-account-widgets/tpaw-protocol.c b/tp-account-widgets/tpaw-protocol.c
index 72c579fc..e3973771 100644
--- a/tp-account-widgets/tpaw-protocol.c
+++ b/tp-account-widgets/tpaw-protocol.c
@@ -371,6 +371,11 @@ add_cm (GetProtocolsData *data,
continue;
if (!tp_strdiff (cm_name, "haze") &&
+ !tp_strdiff (proto_name, "irc"))
+ /* Use Idle for IRC (bgo #711226) */
+ continue;
+
+ if (!tp_strdiff (cm_name, "haze") &&
!tp_strdiff (proto_name, "sip"))
/* Haze's SIP implementation is pretty useless (bgo #629736) */
continue;