diff options
| -rw-r--r-- | services/presence/Activity.py | 2 | ||||
| -rw-r--r-- | services/presence/PresenceService.py | 8 | ||||
| -rw-r--r-- | services/presence/Service.py | 3 | ||||
| -rwxr-xr-x | tests/simulator/kiu.py | 9 |
4 files changed, 12 insertions, 10 deletions
diff --git a/services/presence/Activity.py b/services/presence/Activity.py index 6dc9497..a900ea1 100644 --- a/services/presence/Activity.py +++ b/services/presence/Activity.py @@ -126,7 +126,7 @@ class Activity(object): for serv_list in self._services.values(): for serv in serv_list: owner = serv.get_owner() - if not owner in buddies and owner.is_valid(): + if owner and not owner in buddies and owner.is_valid(): buddies.append(owner) return buddies diff --git a/services/presence/PresenceService.py b/services/presence/PresenceService.py index 976d5e0..73c2efa 100644 --- a/services/presence/PresenceService.py +++ b/services/presence/PresenceService.py @@ -469,11 +469,9 @@ class PresenceService(object): updated): """When the service discovery finally gets here, we've got enough information about the service to assign it to a buddy.""" - tag = "Resolved" - if updated: - tag = "Updated" - logging.debug("%s service '%s' type '%s' domain '%s' to " \ - " %s:%s" % (tag, full_name, stype, domain, address, port)) + if updated == False: + logging.debug("Resolved service '%s' type '%s' domain '%s' to " \ + " %s:%s" % (full_name, stype, domain, address, port)) if not adv in self._service_advs: return False diff --git a/services/presence/Service.py b/services/presence/Service.py index cc49e28..1d70baa 100644 --- a/services/presence/Service.py +++ b/services/presence/Service.py @@ -405,7 +405,8 @@ class Service(gobject.GObject): self._avahi_entry_group.Commit() def __entry_group_changed_cb(self, state, error): - logging.debug("** %s.%s Entry group changed: state %s, error %s" % (self._full_name, self._stype, state, error)) + pass +# logging.debug("** %s.%s Entry group changed: state %s, error %s" % (self._full_name, self._stype, state, error)) def unregister(self, sender): # Refuse to unregister if we can't get the dbus connection this request diff --git a/tests/simulator/kiu.py b/tests/simulator/kiu.py index 434db93..e9339c7 100755 --- a/tests/simulator/kiu.py +++ b/tests/simulator/kiu.py @@ -11,6 +11,7 @@ class KiuBot(Bot): self._olpc_channel_service = None self._sugar_channel_service = None self._activity_switch_timeout = None + self._curact = None action = ShareActivityAction('OLPC channel', '_GroupChatActivity_Sugar_redhat_com._udp', @@ -33,9 +34,11 @@ class KiuBot(Bot): actid = self._sugar_channel_activity.get_id() else: raise RuntimeError("WTF? unexpected value") - print "KIU: now setting current activity to %s" % actid - self._owner.set_current_activity(actid) - self._schedule_activity_switch_timeout() + if actid != self._curact: + print "KIU: now setting current activity to %s" % actid + self._owner.set_current_activity(actid) + self._schedule_activity_switch_timeout() + self._curact = actid return False def _schedule_activity_switch_timeout(self): |