pidgin: fb08a15c: Alright, I'm getting rid of this "groups...

[markdoliner at pidgin.im]

-----------------------------------------------------------------
Revision: fb08a15c49ea1cffb1eb5b50f9cd8c3d57dec5dd
Ancestor: 0828eed4b955faab5f02154e4221797142eb139b
Author: markdoliner at pidgin.im
Date: 2008-07-03T19:53:31
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/fb08a15c49ea1cffb1eb5b50f9cd8c3d57dec5dd

Modified files:
        libpurple/protocols/jabber/roster.c

ChangeLog: 

Alright, I'm getting rid of this "groups" thing for the reason listed
in the comment.  I really don't see how this could be correct, and it's
possible it's causing problem discussed in this thread:
http://pidgin.im/pipermail/devel/2008-June/006191.html

-------------- next part --------------
============================================================
--- libpurple/protocols/jabber/roster.c	bd15d29a173775903e6619b8bc23311c18f1212c
+++ libpurple/protocols/jabber/roster.c	3935ffadba34d0618afae293a7d82ffc2db4cca6
@@ -316,7 +316,6 @@ void jabber_roster_add_buddy(PurpleConne
 {
 	JabberStream *js = gc->proto_data;
 	char *who;
-	GSList *groups = NULL;
 	JabberBuddy *jb;
 	JabberBuddyResource *jbr;
 	char *my_bare_jid;
@@ -329,21 +328,8 @@ void jabber_roster_add_buddy(PurpleConne
 
 	jb = jabber_buddy_find(js, buddy->name, FALSE);
 
-	/*
-	 * For some reason if we're waiting for our subscription request
-	 * to be approved and we try to add the buddy to another group
-	 * then we remove the buddy from the old group.  I don't understand
-	 * the rationale for this, can someone please explain it?  It seems
-	 * like we should pass NULL as the groups parameter to
-	 * jabber_roster_update().
-	 */
-	if(!jb || !(jb->subscription & JABBER_SUB_TO)) {
-		groups = g_slist_append(groups, group->name);
-	}
+	jabber_roster_update(js, who, NULL);
 
-	jabber_roster_update(js, who, groups);
-	g_slist_free(groups);
-
 	my_bare_jid = g_strdup_printf("%s@%s", js->user->node, js->user->domain);
 	if(!strcmp(who, my_bare_jid)) {
 		PurplePresence *gpresence;