Show
Ignore:
Timestamp:
01/06/07 12:00:50 (23 months ago)
Author:
asterix
Message:

merge changeset from trunk except pyopenssl stuff

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • branches/gajim_0.11/src/network_manager_listener.py

    r7307 r7787  
    1818def device_now_active(self, *args): 
    1919        for connection in gajim.connections.itervalues(): 
    20                 if gajim.config.get_per('accounts', connection.name, 'listen_to_network_manager') and gajim.config.get_per('accounts', connection.name, 'sync_with_global_status'): 
    21                         connection.change_status('online', '') 
     20                if gajim.config.get_per('accounts', connection.name, 
     21                'listen_to_network_manager') and connection.time_to_reconnect: 
     22                        connection._reconnect() 
    2223 
    2324def device_no_longer_active(self, *args): 
    2425        for connection in gajim.connections.itervalues(): 
    25                 if gajim.config.get_per('accounts', connection.name, 'listen_to_network_manager') and gajim.config.get_per('accounts', connection.name, 'sync_with_global_status'): 
    26                         connection.change_status('offline', '') 
     26                if gajim.config.get_per('accounts', connection.name, 
     27                'listen_to_network_manager') and connection.connected > 1: 
     28                        connection._disconnectedReconnCB() 
    2729 
    2830