From 1ea1be854bcf344d9dd025db97cab7a1406aea1b Mon Sep 17 00:00:00 2001 From: Jean-Marie Traissard Date: Sat, 4 Nov 2006 04:06:50 +0000 Subject: [PATCH] Fix bug with accounts NOT merged, use get_global_show() and simplify [7354] --- src/roster_window.py | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/src/roster_window.py b/src/roster_window.py index 4fb9eee84..63fa31bd3 100644 --- a/src/roster_window.py +++ b/src/roster_window.py @@ -2696,18 +2696,9 @@ _('If "%s" accepts this request you will know his or her status.') % jid) if not accountIter: return if not self.regroup: - model[accountIter][C_IMG] = self.jabber_state_images['16'][status] - return - status = 0 - for acct in gajim.connections: - connected = gajim.connections[acct].connected - if connected == 1: # connecting - status = 1 - break - if gajim.config.get_per('accounts', acct, 'sync_with_global_status') \ - and connected > 1 and (status == 0 or connected < status): - status = connected - show = gajim.SHOW_LIST[status] + show = gajim.SHOW_LIST[status] + else: # accounts merged + show = helpers.get_global_show() model[accountIter][C_IMG] = self.jabber_state_images['16'][show] def on_status_changed(self, account, status):