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

use helper function. fixes #3263

This commit is contained in:
Yann Leboulanger 2007-06-29 16:25:05 +00:00
parent 30a9202f9d
commit fd03586f2c
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/common/contacts.py
View File

@ -233,14 +233,11 @@ class Contacts:
return contacts_instances
return []
def get_contact_from_full_jid(self, account, jid):
def get_contact_from_full_jid(self, account, fjid):
'''we will split the jid into bare jid and resource part,
then get proper contact.'''
try:
barejid, resource=jid.split('/',1)
return self.get_contact(account, barejid, resource)
except ValueError: # no resource causes split to fail
return None # how to handle that case?
barejid, resource = common.gajim.get_room_and_nick_from_fjid(fjid)
return self.get_contact(account, barejid, resource)
def get_highest_prio_contact_from_contacts(self, contacts):
if not contacts: