From f40cfe26699a60191ab7dfd719206ced739d3955 Mon Sep 17 00:00:00 2001 From: mathieui Date: Mon, 4 Mar 2013 16:01:35 +0100 Subject: [PATCH] Add a show_s2s_errors config option (cf #2182) --- data/default_config.cfg | 3 +++ doc/en/configure.txt | 4 ++++ src/windows.py | 4 ++-- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/data/default_config.cfg b/data/default_config.cfg index 1efec665..681d4dd5 100644 --- a/data/default_config.cfg +++ b/data/default_config.cfg @@ -258,6 +258,9 @@ show_muc_jid = true # poezio will only show: toto (2) show_roster_jids = true +# show s2s errors in the roster +show_s2s_errors = true + # If set to true, the roster will display the offline contacts too roster_show_offline = false diff --git a/doc/en/configure.txt b/doc/en/configure.txt index 716d97a3..02cd454d 100644 --- a/doc/en/configure.txt +++ b/doc/en/configure.txt @@ -388,6 +388,10 @@ section of this documentation. the contact names). If there is no contact name, the JID will still be displayed. +*show_s2s_errors*:: true + + Show s2s errors in the roster or not. + *show_tab_names*:: false If you want to show the tab name in the bottom Tab bar, set this to true. diff --git a/src/windows.py b/src/windows.py index 3919ea8f..f759fa1b 100644 --- a/src/windows.py +++ b/src/windows.py @@ -1895,7 +1895,7 @@ class RosterWin(Win): added += 4 if contact.ask: added += len(get_theme().CHAR_ROSTER_ASKED) - if contact.error: + if config.get('show_s2s_errors', 'true').lower() == 'true' and contact.error: added += len(get_theme().CHAR_ROSTER_ERROR) if config.getl('show_roster_jids', 'true') == 'false' and contact.name: @@ -1913,7 +1913,7 @@ class RosterWin(Win): self.addstr(display_name) if contact.ask: self.addstr(get_theme().CHAR_ROSTER_ASKED, to_curses_attr(get_theme().COLOR_IMPORTANT_TEXT)) - if contact.error: + if config.get('show_s2s_errors', 'true').lower() == 'true' and contact.error: self.addstr(get_theme().CHAR_ROSTER_ERROR, to_curses_attr(get_theme().COLOR_ROSTER_ERROR)) self.finish_line()