From dba0a34a7497427719629c77c51a59d294978d2e Mon Sep 17 00:00:00 2001 From: Yann Leboulanger Date: Wed, 1 Nov 2006 14:50:07 +0000 Subject: [PATCH] follow global status for merged account line. fixes #2620 --- src/roster_window.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/roster_window.py b/src/roster_window.py index c0e9e1218..5bd9d1ddb 100644 --- a/src/roster_window.py +++ b/src/roster_window.py @@ -2650,8 +2650,9 @@ _('If "%s" accepts this request you will know his or her status.') % jid) return model = self.tree.get_model() accountIter = self.get_account_iter(account) - if accountIter: - model[accountIter][0] = self.jabber_state_images['16'][status] + if accountIter and (not self.regroup or gajim.config.get_per('accounts', + account, 'sync_with_global_status')): + model[accountIter][C_IMG] = self.jabber_state_images['16'][status] if status == 'offline': if self.quit_on_next_offline > -1: self.quit_on_next_offline -= 1