copyleftie/gajim-plural
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

new metacontacts JEP (not yet published) uses order instead of priority.

Browse source
This commit is contained in:
Yann Leboulanger 2006-04-11 20:16:33 +00:00
parent 40c61de7cf
commit fe2ec40ad7
2 changed files with 18 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/common/connection_handlers.py
View file

@ -1079,9 +1079,9 @@ class ConnectionHandlers(ConnectionVcard, ConnectionBytestream, ConnectionDisco)
jid = meta.getAttr('jid') jid = meta.getAttr('jid')
tag = meta.getAttr('tag') tag = meta.getAttr('tag')
data = {'jid': jid} data = {'jid': jid}
prio = meta.getAttr('priority') order = meta.getAttr('order')
if prio != None: if order != None:
data['priority'] = prio data['order'] = order
if meta_list.has_key(tag): if meta_list.has_key(tag):
meta_list[tag].append(data) meta_list[tag].append(data)
else: else:

24
src/common/contacts.py
View file

@ -293,8 +293,8 @@ class Contacts:
def get_metacontacts_family(self, account, jid): def get_metacontacts_family(self, account, jid):
'''return the family of the given jid, including jid in the form: '''return the family of the given jid, including jid in the form:
[{'account': acct, 'jid': jid, 'priority': prio}, ] [{'account': acct, 'jid': jid, 'order': order}, ]
'priority' is optional''' 'order' is optional'''
tag = self.get_metacontacts_tag(account, jid) tag = self.get_metacontacts_tag(account, jid)
if not tag: if not tag:
return [] return []
@ -308,16 +308,22 @@ class Contacts:
def _get_data_score(self, data): def _get_data_score(self, data):
'''compute thescore of a gived data '''compute thescore of a gived data
data is {'jid': jid, 'account': account, 'priority': priority} data is {'jid': jid, 'account': account, 'order': order}
priority is optional order is optional
score = meta_priority*10000 + is_jabber*priority*10 + status''' score = (max_order - order)*10000 + is_jabber*priority*10 + status'''
jid = data['jid'] jid = data['jid']
account = data['account'] account = data['account']
priority = 0 max_order = 0
if data.has_key('priority'): order = 0
priority = data['priority'] if data.has_key('order'):
order = data['order']
if order:
family = self.get_metacontacts_family(account, jid)
for data_ in family:
if data_.has_key('order') and data_['order'] > max_order:
max_order = data_['order']
contact = self.get_contact_with_highest_priority(account, jid) contact = self.get_contact_with_highest_priority(account, jid)
score = priority*10000 score = (max_order - order)*10000
if not common.gajim.jid_is_transport(jid): if not common.gajim.jid_is_transport(jid):
score += contact.priority*10 score += contact.priority*10
score += ['not in roster', 'error', 'offline', 'invisible', 'dnd', 'xa', score += ['not in roster', 'error', 'offline', 'invisible', 'dnd', 'xa',