# HG changeset patch
# User Mark Doliner <mark@kingant.net>
# Date 1201822079 0
# Node ID 1ca7a70f1faa7216872d2b00c11617f6f16b63cc
# Parent  4cc1dfbc499bce243327d2eb5ba8d7cbe3e7056c
Use the group passed into yahoo_add_buddy() instead of looking
it up ourselves.

diff -r 4cc1dfbc499b -r 1ca7a70f1faa libpurple/protocols/yahoo/yahoo.c
--- a/libpurple/protocols/yahoo/yahoo.c	Thu Jan 31 22:58:11 2008 +0000
+++ b/libpurple/protocols/yahoo/yahoo.c	Thu Jan 31 23:27:59 2008 +0000
@@ -3848,12 +3848,10 @@
 	yahoo_packet_send_and_free(pkt, yd);
 }
 
-/* XXX - What's the deal with PurpleGroup *foo? */
-static void yahoo_add_buddy(PurpleConnection *gc, PurpleBuddy *buddy, PurpleGroup *foo)
+static void yahoo_add_buddy(PurpleConnection *gc, PurpleBuddy *buddy, PurpleGroup *g)
 {
 	struct yahoo_data *yd = (struct yahoo_data *)gc->proto_data;
 	struct yahoo_packet *pkt;
-	PurpleGroup *g;
 	const char *group = NULL;
 	char *group2;
 	YahooFriend *f;
@@ -3867,15 +3865,11 @@
 
 	f = yahoo_friend_find(gc, purple_buddy_get_name(buddy));
 
-	if (foo)
-		group = foo->name;
-	if (!group) {
-		g = purple_buddy_get_group(buddy);
-		if (g)
-			group = g->name;
-		else
-			group = "Buddies";
-	}
+	g = purple_buddy_get_group(buddy);
+	if (g)
+		group = g->name;
+	else
+		group = "Buddies";
 
 	group2 = yahoo_string_encode(gc, group, NULL);
 	pkt = yahoo_packet_new(YAHOO_SERVICE_ADDBUDDY, YAHOO_STATUS_AVAILABLE, 0);