follow global status for merged account line. fixes #2620

This commit is contained in:
Yann Leboulanger 2006-11-01 14:50:07 +00:00
parent bf09d27040
commit dba0a34a74
1 changed files with 3 additions and 2 deletions

View File

@ -2650,8 +2650,9 @@ _('If "%s" accepts this request you will know his or her status.') % jid)
return return
model = self.tree.get_model() model = self.tree.get_model()
accountIter = self.get_account_iter(account) accountIter = self.get_account_iter(account)
if accountIter: if accountIter and (not self.regroup or gajim.config.get_per('accounts',
model[accountIter][0] = self.jabber_state_images['16'][status] account, 'sync_with_global_status')):
model[accountIter][C_IMG] = self.jabber_state_images['16'][status]
if status == 'offline': if status == 'offline':
if self.quit_on_next_offline > -1: if self.quit_on_next_offline > -1:
self.quit_on_next_offline -= 1 self.quit_on_next_offline -= 1