From fa48c480ff76e3a0b33865886452ca9197d09c8f Mon Sep 17 00:00:00 2001
From: Stephan Erb <steve-e@h3c.de>
Date: Mon, 2 Jun 2008 17:59:59 +0000
Subject: [PATCH] Fix modelfilter regression. Renaming a group duplicated it.

Even make it work in merged accounts mode.
---
 src/roster_window.py | 28 +++++++++++-----------------
 1 file changed, 11 insertions(+), 17 deletions(-)

diff --git a/src/roster_window.py b/src/roster_window.py
index a8377d1c3..78d2515b4 100644
--- a/src/roster_window.py
+++ b/src/roster_window.py
@@ -2596,23 +2596,17 @@ class RosterWindow:
 				for g in helpers.special_groups:
 					if g in (new_text, old_text):
 						return
-				# get all contacts in that group
-				for jid in gajim.contacts.get_jid_list(account):
-					contact = gajim.contacts.get_contact_with_highest_priority(
-						account, jid)
-					if old_text in contact.groups:
-						# set them in the new one and remove it from the old
-						contact.groups.remove(old_text)
-						self.remove_contact(contact.jid, account)
-						if new_text not in contact.groups:
-							contact.groups.append(new_text)
-						self.add_contact(contact.jid, account)
-						gajim.connections[account].update_contact(contact.jid,
-							contact.name, contact.groups)
-				# If last removed iter was not visible, gajim.groups is not cleaned
-				if gajim.groups[account].has_key(old_text):
-					del gajim.groups[account][old_text]
-				self.draw_group(new_text, account)
+				# update all contacts in the given group
+				if self.regroup:
+					accounts = gajim.connections.keys()
+				else:
+					accounts = [account,]
+				for acc in accounts:
+					for jid in gajim.contacts.get_jid_list(acc):
+						contact = gajim.contacts.get_first_contact_from_jid(acc, jid)
+						if old_text in contact.groups:
+							self.remove_contact_from_groups(jid, acc, [old_text,])
+							self.add_contact_to_groups(jid, acc, [new_text,])
 
 		def on_canceled():
 			if gajim.interface.instances.has_key('rename'):