From 4f85656bb03b513bb62110513aa34f254de55e16 Mon Sep 17 00:00:00 2001 From: Stefan Bethge Date: Sat, 21 Oct 2006 00:54:21 +0000 Subject: [PATCH] fix previous commit, don't do nm stuff if account is not synchronized to global status --- src/network_manager_listener.py | 4 ++-- src/roster_window.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/network_manager_listener.py b/src/network_manager_listener.py index 1fe42fb0a..503fcbde6 100644 --- a/src/network_manager_listener.py +++ b/src/network_manager_listener.py @@ -17,12 +17,12 @@ from common import gajim def device_now_active(self, *args): 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', '') def device_no_longer_active(self, *args): 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', '') diff --git a/src/roster_window.py b/src/roster_window.py index 2892de6c2..c0e9e1218 100644 --- a/src/roster_window.py +++ b/src/roster_window.py @@ -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 win.set_active_tab(fjid, account) 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.window.present()