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

Validate service type and check for uid-based services first

Browse Source
This commit is contained in:
Dan Williams 2006-06-16 23:32:50 -04:00
parent 0871ca9f3d
commit d353bd5ed1
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sugar/presence/Buddy.py
View File

@ -99,15 +99,20 @@ class Buddy(gobject.GObject):
short_stype = stype short_stype = stype
if not short_stype: if not short_stype:
raise RuntimeError("Need to specify a service type.") raise RuntimeError("Need to specify a service type.")
# Ensure we're only passed short service types
(dec_uid, dec_stype) = Service._decompose_service_type(short_stype)
if dec_uid:
raise RuntimeError("Use plain service types please!")
uid = None uid = None
if activity: if activity:
uid = activity.get_id() uid = activity.get_id()
if self._services.has_key(short_stype): if uid is not None:
return self._services[short_stype]
elif uid:
for service in self._services.values(): for service in self._services.values():
if service.get_type() == short_stype and service.get_activity_uid() == uid: if service.get_type() == short_stype and service.get_activity_uid() == uid:
return service return service
if self._services.has_key(short_stype):
return self._services[short_stype]
return None return None
def is_valid(self): def is_valid(self):