/pidgin/main: 256604cbbe34: Make it possible to move buddies out...

[Tomasz Wasilczyk]

Changeset: 256604cbbe3469d70ea107c3ee1bf028d5d9fa99
Author:	 Tomasz Wasilczyk <twasilczyk at pidgin.im>
Date:	 2014-05-11 22:22 +0200
Branch:	 release-2.x.y
URL: https://hg.pidgin.im/pidgin/main/rev/256604cbbe34

Description:

Make it possible to move buddies out of default group

diffstat:

 libpurple/protocols/jabber/roster.c |  9 +--------
 1 files changed, 1 insertions(+), 8 deletions(-)

diffs (26 lines):

diff --git a/libpurple/protocols/jabber/roster.c b/libpurple/protocols/jabber/roster.c
--- a/libpurple/protocols/jabber/roster.c
+++ b/libpurple/protocols/jabber/roster.c
@@ -460,8 +460,6 @@ void jabber_roster_group_change(PurpleCo
 {
 	GSList *buddies, *groups = NULL;
 	PurpleBuddy *b;
-	PurpleGroup *g;
-	const char *gname;
 
 	if(!old_group || !new_group || !strcmp(old_group, new_group))
 		return;
@@ -469,12 +467,7 @@ void jabber_roster_group_change(PurpleCo
 	buddies = purple_find_buddies(gc->account, name);
 	while(buddies) {
 		b = buddies->data;
-		g = purple_buddy_get_group(b);
-		gname = jabber_roster_group_get_global_name(g);
-		if(!strcmp(gname, old_group))
-			groups = g_slist_append(groups, (char*)new_group); /* ick */
-		else
-			groups = g_slist_append(groups, (char*)gname);
+		groups = g_slist_append(groups, (char*)new_group);
 		buddies = g_slist_remove(buddies, b);
 	}