[Dicson] Fixes #7070

This commit is contained in:
Yann Leboulanger 2012-02-14 21:49:48 +01:00
parent 50e0718df6
commit 00e53b2571
1 changed files with 20 additions and 14 deletions

View File

@ -125,17 +125,6 @@ class StandardCommonCommands(CommandContainer):
self.echo(formatted) self.echo(formatted)
def _get_connected_accounts(self):
conns = []
for conn in gajim.connections.itervalues():
if not gajim.config.get_per('accounts', conn.name,
'sync_with_global_status'):
continue
if conn.connected <= 2:
continue
conns.append(conn)
return conns
@command(raw=True, empty=True) @command(raw=True, empty=True)
@doc(_(""" @doc(_("""
Set current the status Set current the status
@ -146,7 +135,12 @@ class StandardCommonCommands(CommandContainer):
def status(self, status, message): def status(self, status, message):
if status not in ('online', 'away', 'chat', 'xa', 'dnd'): if status not in ('online', 'away', 'chat', 'xa', 'dnd'):
raise CommandError("Invalid status given") raise CommandError("Invalid status given")
for connection in self._get_connected_accounts(): for connection in gajim.connections.itervalues():
if not gajim.config.get_per('accounts', connection.name,
'sync_with_global_status'):
continue
if connection.connected <= 2:
continue
connection.change_status(status, message) connection.change_status(status, message)
@command(raw=True, empty=True) @command(raw=True, empty=True)
@ -154,7 +148,13 @@ class StandardCommonCommands(CommandContainer):
def away(self, message): def away(self, message):
if not message: if not message:
message = _("Away") message = _("Away")
for connection in self._get_connected_accounts():
for connection in gajim.connections.itervalues():
if not gajim.config.get_per('accounts', connection.name,
'sync_with_global_status'):
continue
if connection.connected <= 2:
continue
connection.change_status('away', message) connection.change_status('away', message)
@command('back', raw=True, empty=True) @command('back', raw=True, empty=True)
@ -162,7 +162,13 @@ class StandardCommonCommands(CommandContainer):
def online(self, message): def online(self, message):
if not message: if not message:
message = _("Available") message = _("Available")
for connection in self._get_connected_accounts():
for connection in gajim.connections.itervalues():
if not gajim.config.get_per('accounts', connection.name,
'sync_with_global_status'):
continue
if connection.connected <= 2:
continue
connection.change_status('online', message) connection.change_status('online', message)
class StandardCommonChatCommands(CommandContainer): class StandardCommonChatCommands(CommandContainer):