# HG changeset patch
# User Gary Kramlich <grim@reaperworld.com>
# Date 1229147360 0
# Node ID cf6dfd38c7c1d4bfc912fb7ef15f2c9a4b91e70c
# Parent  65cfc59858cfade0fc4134c42d35806067bc8cc9
Fix a botched line in the merge...

diff -r 65cfc59858cf -r cf6dfd38c7c1 libpurple/protocols/qq/im.c
--- a/libpurple/protocols/qq/im.c	Sat Dec 13 05:45:27 2008 +0000
+++ b/libpurple/protocols/qq/im.c	Sat Dec 13 05:49:20 2008 +0000
@@ -785,7 +785,7 @@
 		/* create no-auth buddy */
 		buddy = qq_buddy_new(gc, im_header->uid_from);
 	}
-	bd = (buddy == NULL) ? NULL : purple_buddy_get_protocol_data(b);
+	bd = (buddy == NULL) ? NULL : purple_buddy_get_protocol_data(buddy);
 	if (bd != NULL) {
 		bd->client_tag = im_header->version_from;
 		bd->face = im_text.sender_icon;