From ec74544a8829825977b423eda1e90e37f6c2a1d1 Mon Sep 17 00:00:00 2001 From: Yann Leboulanger Date: Sun, 3 Jan 2016 13:02:22 +0100 Subject: [PATCH] do not allow to drop a group on itself or a subgroup of itself. Fixes #8211 --- src/roster_window.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/roster_window.py b/src/roster_window.py index 72b758fd6..df953e5d7 100644 --- a/src/roster_window.py +++ b/src/roster_window.py @@ -4800,8 +4800,12 @@ class RosterWindow: 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)