sugarlabs/sugar-toolkit-gtk3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Announce new activities when we resolve them, and add a hook to intercept new service advertisements

Browse Source
This commit is contained in:
Dan Williams 2006-06-15 17:41:26 -04:00
parent 31e9671190
commit e4677ee22a
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sugar/presence/PresenceService.py
View File

@ -67,7 +67,11 @@ class PresenceService(gobject.GObject):
'buddy-appeared': (gobject.SIGNAL_RUN_FIRST, gobject.TYPE_NONE, 'buddy-appeared': (gobject.SIGNAL_RUN_FIRST, gobject.TYPE_NONE,
([gobject.TYPE_PYOBJECT])), ([gobject.TYPE_PYOBJECT])),
'buddy-disappeared': (gobject.SIGNAL_RUN_FIRST, gobject.TYPE_NONE, 'buddy-disappeared': (gobject.SIGNAL_RUN_FIRST, gobject.TYPE_NONE,
([gobject.TYPE_PYOBJECT])) ([gobject.TYPE_PYOBJECT])),
'activity-announced': (gobject.SIGNAL_RUN_FIRST, gobject.TYPE_NONE,
([gobject.TYPE_PYOBJECT, gobject.TYPE_PYOBJECT])),
'new-service-adv': (gobject.SIGNAL_RUN_FIRST, gobject.TYPE_NONE,
([gobject.TYPE_STRING, gobject.TYPE_STRING]))
} }
__lock = threading.Lock() __lock = threading.Lock()
@ -206,6 +210,7 @@ class PresenceService(gobject.GObject):
if not self._activity_services.has_key(uid): if not self._activity_services.has_key(uid):
self._activity_services[uid] = [] self._activity_services[uid] = []
self._activity_services[uid].append((buddy, service)) self._activity_services[uid].append((buddy, service))
self.emit('activity-announced', service, buddy)
def _handle_remove_service_for_activity(self, service, buddy): def _handle_remove_service_for_activity(self, service, buddy):
(uid, ignore) = service.get_activity_uid() (uid, ignore) = service.get_activity_uid()
@ -279,6 +284,9 @@ class PresenceService(gobject.GObject):
# Decompose service type if we can # Decompose service type if we can
(uid, stype) = Service._decompose_service_type(stype) (uid, stype) = Service._decompose_service_type(stype)
# FIXME: find a better way of letting StartPage get all activity advertisements
self.emit('new-service-adv', uid, stype)
# If we care about the service right now, resolve it # If we care about the service right now, resolve it
resolve = False resolve = False
if uid in self._activity_uids: if uid in self._activity_uids:
@ -377,7 +385,6 @@ class PresenceService(gobject.GObject):
a certain mDNS service types.""" a certain mDNS service types."""
if not self._started: if not self._started:
raise RuntimeError("presence service must be started first.") raise RuntimeError("presence service must be started first.")
print "about to track type %s" % stype
if type(stype) != type("") and type(stype) != type(u""): if type(stype) != type("") and type(stype) != type(u""):
raise ValueError("service type must be a string.") raise ValueError("service type must be a string.")
if type(stype) == type(u""): if type(stype) == type(u""):