do not allow to move a contact to transport or not in roster group. Fixes #1571
This commit is contained in:
parent
bafb439d35
commit
eb10d38708
|
@ -2742,6 +2742,8 @@ _('If "%s" accepts this request you will know his or her status.') % jid)
|
||||||
# Get destination group
|
# Get destination group
|
||||||
if type_dest == 'group':
|
if type_dest == 'group':
|
||||||
grp_dest = model[iter_dest][C_JID].decode('utf-8')
|
grp_dest = model[iter_dest][C_JID].decode('utf-8')
|
||||||
|
if grp_dest == _('Transports') or grp_dest == _('Not in Roster'):
|
||||||
|
return
|
||||||
if context.action == gtk.gdk.ACTION_COPY:
|
if context.action == gtk.gdk.ACTION_COPY:
|
||||||
self.on_drop_in_group(None, account, c_source, grp_dest, context,
|
self.on_drop_in_group(None, account, c_source, grp_dest, context,
|
||||||
etime)
|
etime)
|
||||||
|
@ -2751,7 +2753,7 @@ _('If "%s" accepts this request you will know his or her status.') % jid)
|
||||||
return
|
return
|
||||||
else:
|
else:
|
||||||
it = iter_dest
|
it = iter_dest
|
||||||
while model[it][C_TYPE] == 'contact':
|
while model[it][C_TYPE] != 'group':
|
||||||
it = model.iter_parent(it)
|
it = model.iter_parent(it)
|
||||||
grp_dest = model[it][C_JID].decode('utf-8')
|
grp_dest = model[it][C_JID].decode('utf-8')
|
||||||
if grp_dest == _('Transports') or grp_dest == _('Not in Roster'):
|
if grp_dest == _('Transports') or grp_dest == _('Not in Roster'):
|
||||||
|
|
Loading…
Reference in New Issue