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

services/presence/server_plugin: special-case the Owner when IDing buddies.

Browse Source 
We always know who we are, so don't need to inspect our own handle or anything.
This commit is contained in:
Simon McVittie 2007-05-30 17:43:16 +01:00
parent b362ed625c
commit 22b1338ac5
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
services/presence/server_plugin.py
View File

@ -1131,20 +1131,27 @@ class ServerPlugin(gobject.GObject):
owners = handles owners = handles
if tp_chan is not None and CHANNEL_INTERFACE_GROUP in tp_chan: if tp_chan is not None and CHANNEL_INTERFACE_GROUP in tp_chan:
group = tp_chan[CHANNEL_INTERFACE_GROUP] group = tp_chan[CHANNEL_INTERFACE_GROUP]
if group.GetFlags() & CHANNEL_GROUP_FLAG_CHANNEL_SPECIFIC_HANDLES: if (group.GetGroupFlags() &
CHANNEL_GROUP_FLAG_CHANNEL_SPECIFIC_HANDLES):
owners = group.GetHandleOwners(handles) owners = group.GetHandleOwners(handles)
for i, owner in enumerate(owners): for i, owner in enumerate(owners):
if owner == 0: if owner == 0:
owners[i] = handles[i] owners[i] = handles[i]
else:
group = None
jids = self._conn[CONN_INTERFACE].InspectHandles(HANDLE_TYPE_CONTACT, jids = self._conn[CONN_INTERFACE].InspectHandles(HANDLE_TYPE_CONTACT,
owners) owners)
ret = {} ret = {}
for handle, jid in zip(handles, jids): for handle, jid in zip(handles, jids):
# special-case the Owner - we always know who we are
if (handle == self.self_handle or
(group is not None and handle == group.GetSelfHandle())):
ret[handle] = self._owner.props.objid
continue
if '/' in jid: if '/' in jid:
# the contact is unidentifiable (in an anonymous MUC) - create # the contact is unidentifiable (in an anonymous MUC) - create
# a temporary identity for them, based on their room-JID # a temporary identity for them, based on their room-JID