diff options
Diffstat (limited to 'src/network_manager_listener.py')
-rw-r--r-- | src/network_manager_listener.py | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/src/network_manager_listener.py b/src/network_manager_listener.py index 80c2cf86a..e624cc68e 100644 --- a/src/network_manager_listener.py +++ b/src/network_manager_listener.py @@ -39,17 +39,17 @@ def device_no_longer_active(self, *args): 'listen_to_network_manager') and connection.connected > 1: connection._disconnectedReconnCB() -def state_changed(state): +def state_changed(state): '''For Network Manager 0.7''' - if props.Get("org.freedesktop.NetworkManager", "State") == 3: - for connection in gajim.connections.itervalues(): - if gajim.config.get_per('accounts', connection.name, - 'listen_to_network_manager') and connection.time_to_reconnect: - connection._reconnect() - else: - for connection in gajim.connections.itervalues(): - if gajim.config.get_per('accounts', connection.name, - 'listen_to_network_manager') and connection.connected > 1: + if props.Get("org.freedesktop.NetworkManager", "State") == 3: + for connection in gajim.connections.itervalues(): + if gajim.config.get_per('accounts', connection.name, + 'listen_to_network_manager') and connection.time_to_reconnect: + connection._reconnect() + else: + for connection in gajim.connections.itervalues(): + if gajim.config.get_per('accounts', connection.name, + 'listen_to_network_manager') and connection.connected > 1: connection._disconnectedReconnCB() supported = False @@ -61,23 +61,23 @@ if sys.platform == 'darwin': elif dbus_support.supported: import dbus import dbus.glib - - try: + + try: from common.dbus_support import system_bus bus = system_bus.bus() if 'org.freedesktop.NetworkManager' in bus.list_names(): - nm_object = bus.get_object('org.freedesktop.NetworkManager', - '/org/freedesktop/NetworkManager') - props = dbus.Interface(nm_object,"org.freedesktop.DBus.Properties") - bus.add_signal_receiver(state_changed, - 'StateChanged', - 'org.freedesktop.NetworkManager', - 'org.freedesktop.NetworkManager', + nm_object = bus.get_object('org.freedesktop.NetworkManager', + '/org/freedesktop/NetworkManager') + props = dbus.Interface(nm_object,"org.freedesktop.DBus.Properties") + bus.add_signal_receiver(state_changed, + 'StateChanged', + 'org.freedesktop.NetworkManager', + 'org.freedesktop.NetworkManager', '/org/freedesktop/NetworkManager') supported = True - + except dbus.DBusException: try: if 'org.freedesktop.NetworkManager' in bus.list_names(): |