we can DND a contact on another account's group if we are in merged mode. Fixes #1888

This commit is contained in:
Yann Leboulanger 2006-04-28 19:09:52 +00:00
parent 87253c461a
commit cab5718458
1 changed files with 6 additions and 2 deletions

View File

@ -3131,8 +3131,12 @@ _('If "%s" accepts this request you will know his or her status.') % jid)
if type_source != 'contact': # source is not a contact
return
source_account = model[iter_source][C_ACCOUNT].decode('utf-8')
if account != source_account: # dropped in another account
return
if account != source_account: # dropped in another account
if self.regroup and type_dest == 'group':
# on a group in merge mode is ok
account = source_account
else:
return
it = iter_source
while model[it][C_TYPE] == 'contact':
it = model.iter_parent(it)