Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar

services/presence/pstest.py

@@ -173,7 +173,7 @@ class TestPresenceService(PresenceService):
                          self.__test_num, self.__randomize)
 
     def internal_get_activity(self, actid):
-        return self._activities.get(actid, None):
+        return self._activities.get(actid, None)
 
 
 def _extract_public_key(keyfile):

services/presence/psutils.py

@@ -117,6 +117,9 @@ class IP4AddressMonitor(gobject.GObject):
 
         sys_bus = dbus.SystemBus()
         self._watch = sys_bus.watch_name_owner(NM_SERVICE, self._nm_owner_cb)
+        if not sys_bus.name_has_owner(NM_SERVICE):
+            addr = self._get_address_fallback()
+            self._update_address(addr)
 
     def do_get_property(self, pspec):
         if pspec.name == "address":