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

don't definitively remove a contact when it has unread events

This commit is contained in:
Yann Leboulanger 2006-04-26 21:43:58 +00:00
parent 0cb3d7cbd7
commit 5a20109e05
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/gajim.py
View File

@ -977,8 +977,21 @@ class Interface:
if (not sub or sub == 'none') and (not ask or ask == 'none') and \ if (not sub or sub == 'none') and (not ask or ask == 'none') and \
not name and not groups: not name and not groups:
if contacts: if contacts:
self.roster.remove_contact(contacts[0], account) c = contacts[0]
self.roster.remove_contact(c, account)
gajim.contacts.remove_jid(account, jid) gajim.contacts.remove_jid(account, jid)
if gajim.awaiting_events[account].has_key(c.jid):
keyID = ''
attached_keys = gajim.config.get_per('accounts', account,
'attached_gpg_keys').split()
if jid in attached_keys:
keyID = attached_keys[attached_keys.index(jid) + 1]
contact = gajim.contacts.create_contact(jid = c.jid,
name = '', groups = [_('Not in Roster')],
show = 'not in roster', status = '', sub = 'none',
keyID = keyID)
gajim.contacts.add_contact(account, contact)
self.roster.add_contact_to_roster(contact.jid, account)
#FIXME if it was the only one in its group, remove the group #FIXME if it was the only one in its group, remove the group
return return
elif not contacts: elif not contacts: