pidgin.next.minor: 9c4b346f: Fix a botched line in the merge...

[grim at pidgin.im]

-----------------------------------------------------------------
Revision: 9c4b346f6536ab35c06e2c6cabb905bae60c420d
Ancestor: 6df3cc6eaa1e3cc37f8272ae444362a60b68145d
Author: grim at pidgin.im
Date: 2008-12-13T05:49:20
Branch: im.pidgin.pidgin.next.minor
URL: http://d.pidgin.im/viewmtn/revision/info/9c4b346f6536ab35c06e2c6cabb905bae60c420d

Modified files:
        libpurple/protocols/qq/im.c

ChangeLog: 

Fix a botched line in the merge...


-------------- next part --------------
============================================================
--- libpurple/protocols/qq/im.c	6379c9acf0518bdc0106c96769c5dcf5e49b9567
+++ libpurple/protocols/qq/im.c	540ea40f406742219f1599b4e2293e039deede1a
@@ -785,7 +785,7 @@ static void process_im_text(PurpleConnec
 		/* 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;