diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2007-05-28 16:10:54 (GMT) |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2007-05-28 16:10:54 (GMT) |
| commit | 5dacfdd365a48dcd07389c5e979b8b118e932355 (patch) | |
| tree | 99ac8bd5d5a549a059ae2c46c49011a21bbd9b72 /services | |
| parent | 706830c4892d3d4bc3b28114580f52805bf425a1 (diff) | |
| parent | 8915657a0835bfad1daae9c09cac98e6725ae568 (diff) | |
Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar
Diffstat (limited to 'services')
| -rw-r--r-- | services/presence/pstest.py | 2 | ||||
| -rw-r--r-- | services/presence/psutils.py | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/services/presence/pstest.py b/services/presence/pstest.py index 708f1d1..1900993 100644 --- a/services/presence/pstest.py +++ b/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): diff --git a/services/presence/psutils.py b/services/presence/psutils.py index 06b8a83..04e7eec 100644 --- a/services/presence/psutils.py +++ b/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": |