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

fix previous commit, don't do nm stuff if account is not synchronized to global status

Browse source
This commit is contained in:
Stefan Bethge 2006-10-21 00:54:21 +00:00
parent 0465e3dcdb
commit 4f85656bb0
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/network_manager_listener.py
View file

@ -17,12 +17,12 @@ from common import gajim
def device_now_active(self, *args): def device_now_active(self, *args):
for connection in gajim.connections.itervalues(): for connection in gajim.connections.itervalues():
if gajim.config.get_per('accounts', connection.name, 'listen_to_network_manager'): if gajim.config.get_per('accounts', connection.name, 'listen_to_network_manager') and gajim.config.get_per('accounts', connection.name, 'sync_with_global_status'):
connection.change_status('online', '') connection.change_status('online', '')
def device_no_longer_active(self, *args): def device_no_longer_active(self, *args):
for connection in gajim.connections.itervalues(): for connection in gajim.connections.itervalues():
if gajim.config.get_per('accounts', connection.name, 'listen_to_network_manager'): if gajim.config.get_per('accounts', connection.name, 'listen_to_network_manager') and gajim.config.get_per('accounts', connection.name, 'sync_with_global_status'):
connection.change_status('offline', '') connection.change_status('offline', '')

2
src/roster_window.py
View file

@ -3117,7 +3117,7 @@ _('If "%s" accepts this request you will know his or her status.') % jid)
gajim.last_message_time[account][ctrl.get_full_jid()] = 0 gajim.last_message_time[account][ctrl.get_full_jid()] = 0
win.set_active_tab(fjid, account) win.set_active_tab(fjid, account)
if gajim.connections[account].is_zeroconf and \ if gajim.connections[account].is_zeroconf and \
gajim.connections[account].status in ('offline', 'invisible') gajim.connections[account].status in ('offline', 'invisible'):
win.get_control(fjid, account).got_disconnected() win.get_control(fjid, account).got_disconnected()
win.window.present() win.window.present()