again fix Gajim so it runs if NM is not there. Stefan please have a look from time to time in the timeline to see other ppl fixes [f.e. this was done by Yann b4]
This commit is contained in:
parent
4f85656bb0
commit
cf5666043c
2 changed files with 12 additions and 11 deletions
|
@ -32,6 +32,7 @@ from chat_control import ChatControlBase
|
|||
|
||||
from common import exceptions
|
||||
from common.zeroconf import connection_zeroconf
|
||||
from common import dbus_support
|
||||
|
||||
if os.name == 'posix': # dl module is Unix Only
|
||||
try: # rename the process name to gajim
|
||||
|
@ -1938,11 +1939,11 @@ class Interface:
|
|||
else:
|
||||
self.remote_ctrl = None
|
||||
|
||||
if gajim.config.get('networkmanager_support'):
|
||||
if gajim.config.get('networkmanager_support') and dbus_support.supported:
|
||||
try:
|
||||
import network_manager_listener
|
||||
except ImportError:
|
||||
pass
|
||||
except:
|
||||
print >> sys.stderr, _('Network Manager support not available')
|
||||
|
||||
self.show_vcard_when_connect = []
|
||||
|
||||
|
|
|
@ -34,14 +34,14 @@ import dbus.glib
|
|||
bus = system_bus.SystemBus()
|
||||
|
||||
bus.add_signal_receiver(device_no_longer_active,
|
||||
'DeviceNoLongerActive',
|
||||
'org.freedesktop.NetworkManager',
|
||||
'org.freedesktop.NetworkManager',
|
||||
'/org/freedesktop/NetworkManager')
|
||||
'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')
|
||||
'DeviceNowActive',
|
||||
'org.freedesktop.NetworkManager',
|
||||
'org.freedesktop.NetworkManager',
|
||||
'/org/freedesktop/NetworkManager')
|
||||
|
||||
|
|
Loading…
Add table
Reference in a new issue