Mercurial > pidgin.yaz

changeset 26951:329f5a43b68a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge of '49bc9af35492c4f9b66f7233c77ec192432a00f0' and '70ee1de1cc79688256a3dd6ac1a519e24c00a12c'
author Paul Aurich <paul@darkrain42.org>
date Mon, 11 May 2009 22:05:00 +0000
parents 9612a2e8db87 (diff) 4f36ec04181c (current diff)
children 92565c8e1e3a d62b94408a00
files
diffstat 1 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- 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);