# HG changeset patch
# User Paul Aurich <paul@darkrain42.org>
# Date 1242079500 0
# Node ID 329f5a43b68a5799b347c3e32d5152dc67ee642b
# Parent  9612a2e8db870c0c946dc00146c76bdea5d1e3c6# Parent  4f36ec04181c37eb746eff2e61e19317b6179009
merge of '49bc9af35492c4f9b66f7233c77ec192432a00f0'
     and '70ee1de1cc79688256a3dd6ac1a519e24c00a12c'

diff -r 4f36ec04181c -r 329f5a43b68a libpurple/protocols/oscar/oscar.c
--- a/libpurple/protocols/oscar/oscar.c	Mon May 11 01:37:56 2009 +0000
+++ b/libpurple/protocols/oscar/oscar.c	Mon May 11 22:05:00 2009 +0000
@@ -930,7 +930,7 @@
 	PurpleGroup *g = NULL;
 	struct buddyinfo *bi = NULL;
 	char *tmp;
-	const char *bname, *gname = NULL;
+	const char *bname = NULL, *gname = NULL;
 
 	od = purple_connection_get_protocol_data(gc);
 	account = purple_connection_get_account(gc);
@@ -938,14 +938,14 @@
 	if ((user_info == NULL) || ((b == NULL) && (userinfo == NULL)))
 		return;
 
-	bname = purple_buddy_get_name(b);
 	if (userinfo == NULL)
-		userinfo = aim_locate_finduserinfo(od, bname);
+		userinfo = aim_locate_finduserinfo(od, purple_buddy_get_name(b));
 
 	if (b == NULL)
 		b = purple_find_buddy(account, userinfo->bn);
 
 	if (b != NULL) {
+		bname = purple_buddy_get_name(b);
 		g = purple_buddy_get_group(b);
 		gname = purple_group_get_name(g);
 		presence = purple_buddy_get_presence(b);