diff options
author | Dan Williams <dcbw@localhost.localdomain> | 2006-08-24 15:09:53 (GMT) |
---|---|---|
committer | Dan Williams <dcbw@localhost.localdomain> | 2006-08-24 15:09:53 (GMT) |
commit | d2c082916573fad6ac06ffa8226b01ec98ae888c (patch) | |
tree | e4841d0c352ad9e52ab3b80e7a0eafc6ed604d12 | |
parent | 3f50668494739fdb5e674542df4df19d83638ced (diff) |
Don't traceback when somebody doesn't advertise their color
-rw-r--r-- | shell/PresenceService/Buddy.py | 4 | ||||
-rw-r--r-- | sugar/presence/Buddy.py | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/shell/PresenceService/Buddy.py b/shell/PresenceService/Buddy.py index fc4d185..6d3ff3d 100644 --- a/shell/PresenceService/Buddy.py +++ b/shell/PresenceService/Buddy.py @@ -74,7 +74,9 @@ class BuddyDBusHelper(dbus.service.Object): props['name'] = self._parent.get_name() props['ip4_address'] = self._parent.get_address() props['owner'] = self._parent.is_owner() - props['color'] = self._parent.get_color() + color = self._parent.get_color() + if color: + props['color'] = self._parent.get_color() return props diff --git a/sugar/presence/Buddy.py b/sugar/presence/Buddy.py index 5ae41f8..dc5427d 100644 --- a/sugar/presence/Buddy.py +++ b/sugar/presence/Buddy.py @@ -35,6 +35,8 @@ class Buddy(gobject.GObject): self._buddy.connect_to_signal('LeftActivity', self._left_activity_cb) self._buddy.connect_to_signal('PropertyChanged', self._property_changed_cb) self._properties = self._buddy.getProperties() + if not self._properties.has_key('color'): + self._properties['color'] = "#deadbe" def object_path(self): return self._object_path |