changeset d8baa5e950f8 in /home/hg/repos/gajim

author: Yann Leboulanger asterix@lagaule.org branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=d8baa5e950f8 description: do not allow to drop a group on itself or a subgroup of itself. Fixes #8211

diffstat:

src/roster_window.py | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-)

diffs (18 lines):

diff -r 197296583ae8 -r d8baa5e950f8 src/roster_window.py --- a/src/roster_window.py Sun Jan 03 11:07:44 2016 +0100 +++ b/src/roster_window.py Sun Jan 03 13:02:22 2016 +0100 @@ -4800,8 +4800,12 @@ if type_dest == 'account': new_grp = grp_source_list[-1] elif type_dest == 'group': - new_grp = model[iter_dest][C_JID] + delimiter +\ - grp_source_list[-1] + grp_dest = model[iter_dest][C_JID] + grp_dest_list = grp_dest.split(delimiter) + # Do not allow to drop on a subgroup of source group + if grp_source_list[0] != grp_dest_list[0]: + new_grp = model[iter_dest][C_JID] + delimiter + \ + grp_source_list[-1] if new_grp: self.move_group(grp_source, new_grp, account_source)