copyleftie/gajim-plural
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

make urgency hint work correctly in one message window mode. Fixes #7806

Browse source
This commit is contained in:
Yann Leboulanger 2015-05-06 22:05:42 +02:00
parent d121881b3a
commit b58a76d8ee
1 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/roster_window.py
View file

@ -5004,15 +5004,7 @@ class RosterWindow:
if not change_title_allowed: if not change_title_allowed:
return 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 nb_unread = 0
start = ''
for account in gajim.connections: for account in gajim.connections:
# Count events in roster title only if we don't auto open them # Count events in roster title only if we don't auto open them
if not helpers.allow_popup_window(account): if not helpers.allow_popup_window(account):
@ -5020,6 +5012,17 @@ class RosterWindow:
'file-request', 'file-error', 'file-completed', 'file-request', 'file-error', 'file-completed',
'file-request-error', 'file-send-error', 'file-stopped', 'file-request-error', 'file-send-error', 'file-stopped',
'printed_chat'], account) '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: if nb_unread > 1:
start = '[' + str(nb_unread) + '] ' start = '[' + str(nb_unread) + '] '
elif nb_unread == 1: elif nb_unread == 1: