changeset 3bce5506df4c in /home/hg/repos/gajim

author: Yann Leboulanger asterix@lagaule.org branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=3bce5506df4c description: make urgency hint work correctly in one message window mode. Fixes #7806

diffstat:

src/roster_window.py | 19 +++++++++++-------- 1 files changed, 11 insertions(+), 8 deletions(-)

diffs (37 lines):

diff -r b311fd4f2983 -r 3bce5506df4c src/roster_window.py --- a/src/roster_window.py Mon May 04 22:53:39 2015 +0200 +++ b/src/roster_window.py Wed May 06 22:05:42 2015 +0200 @@ -4983,15 +4983,7 @@ if not change_title_allowed: return

- if gajim.config.get('one_message_window') == 'always_with_roster': - # always_with_roster mode defers to the MessageWindow - if not gajim.interface.msg_win_mgr.one_window_opened(): - # No MessageWindow to defer to - self.window.set_title('Gajim') - return - nb_unread = 0 - start = '' for account in gajim.connections: # Count events in roster title only if we don't auto open them if not helpers.allow_popup_window(account): @@ -4999,6 +4991,17 @@ 'file-request', 'file-error', 'file-completed', 'file-request-error', 'file-send-error', 'file-stopped', 'printed_chat'], account) + + + if gajim.config.get('one_message_window') == 'always_with_roster': + # always_with_roster mode defers to the MessageWindow + if not gajim.interface.msg_win_mgr.one_window_opened(): + # No MessageWindow to defer to + self.window.set_title('Gajim') + gtkgui_helpers.set_unset_urgency_hint(self.window, nb_unread) + return + + start = '' if nb_unread > 1: start = '[' + str(nb_unread) + '] ' elif nb_unread == 1: