Merge lp:~ezrareeves/groundcontrol/nm-fail into lp:groundcontrol

[Ezra Reeves]

If NetworkManager is not running GC will assume that it is always connected.

Implemented by searching current dbus objects for NM before trying to use it.

Because of the current authentication issues with GC I have not been able to test it while connected.

[Łukasz Jernaś (deejay1)]

Looks good to me

=== modified file 'GroundControl/base.py'
--- GroundControl/base.py	2010-03-01 06:04:07 +0000
+++ GroundControl/base.py	2010-03-24 14:20:32 +0000
@@ -130,21 +130,33 @@
 NM_STATE_DISCONNECTED = 4
 NM_LOCATION = '/org/freedesktop/NetworkManager'
 NM_OBJNAME = 'org.freedesktop.NetworkManager'
+DBUS_LOCATION = '/org/freedesktop/DBus'
+DBUS_OBJNAME = 'org.freedesktop.DBus'
 
 from dbus.mainloop.glib import DBusGMainLoop
 
 DBusGMainLoop(set_as_default=True)
 
 bus = dbus.SystemBus()
-nm = bus.get_object(NM_OBJNAME, NM_LOCATION)
+dbus_objects = dbus.Interface(bus.get_object(DBUS_OBJNAME, DBUS_LOCATION), 
+                              DBUS_OBJNAME).ListNames()
+
+running_NM = True if NM_OBJNAME in dbus_objects else False
+
+if running_NM:
+    nm = bus.get_object(NM_OBJNAME, NM_LOCATION)
 
 def is_online():
     """Return true if we're online"""
-    return nm.state() == NM_STATE_CONNECTED
+    if not running_NM:
+        return True  #if NM is not running assume always connected
+    else:
+        return nm.state() == NM_STATE_CONNECTED
 
 def set_online_changed(method):
     """Tie a method to a network manager status change"""
-    bus.add_signal_receiver(method, 'StateChanged',
+    if running_NM :
+	bus.add_signal_receiver(method, 'StateChanged',
         NM_OBJNAME, NM_OBJNAME, NM_LOCATION)
 
 def save_config(name=CONFIG_NAME, yaml=GC_CONFIG):