Author: asterix Date: 2007-06-26 22:59:30 +0200 (Tue, 26 Jun 2007) New Revision: 8319

Modified: trunk/src/gajim.py trunk/src/network_manager_listener.py Log: better network_manager detection

Modified: trunk/src/gajim.py =================================================================== --- trunk/src/gajim.py 2007-06-26 20:55:49 UTC (rev 8318) +++ trunk/src/gajim.py 2007-06-26 20:59:30 UTC (rev 8319) @@ -2370,9 +2370,8 @@ self.remote_ctrl = None

if gajim.config.get('networkmanager_support') and dbus_support.supported: - try: - import network_manager_listener - except: + import network_manager_listener + if not network_manager_listener.supported: print >> sys.stderr, _('Network Manager support not available')

self.show_vcard_when_connect = []

Modified: trunk/src/network_manager_listener.py =================================================================== --- trunk/src/network_manager_listener.py 2007-06-26 20:55:49 UTC (rev 8318) +++ trunk/src/network_manager_listener.py 2007-06-26 20:59:30 UTC (rev 8319) @@ -27,23 +27,23 @@ 'listen_to_network_manager') and connection.connected > 1: connection._disconnectedReconnCB()

+supported = False

-from common.dbus_support import system_bus +try: + from common.dbus_support import system_bus

-import dbus -import dbus.glib + bus = system_bus.SystemBus()

-bus = system_bus.SystemBus() + if 'org.freedesktop.NetworkManager' in bus.list_names(): + supported = True + bus.add_signal_receiver(device_no_longer_active, + 'DeviceNoLongerActive', + 'org.freedesktop.NetworkManager', + 'org.freedesktop.NetworkManager', + '/org/freedesktop/NetworkManager')

-bus.add_signal_receiver(device_no_longer_active, - 'DeviceNoLongerActive', - 'org.freedesktop.NetworkManager', - 'org.freedesktop.NetworkManager', - '/org/freedesktop/NetworkManager') - -bus.add_signal_receiver(device_now_active, - 'DeviceNowActive', - 'org.freedesktop.NetworkManager', - 'org.freedesktop.NetworkManager', - '/org/freedesktop/NetworkManager') - + bus.add_signal_receiver(device_now_active, + 'DeviceNowActive', + 'org.freedesktop.NetworkManager', + 'org.freedesktop.NetworkManager', + '/org/freedesktop/NetworkManager')