pidgin: 33a3e1b9: Fix the merge some more

[darkrain42 at pidgin.im]

----------------------------------------------------------------------
Revision: 33a3e1b908ecb4b95c19fca0ccc93d4eca2bb26a
Parent:   90563b555003eba18fcf35404c001c70b9f4c184
Author:   darkrain42 at pidgin.im
Date:     06/26/11 16:37:03
Branch:   im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/33a3e1b908ecb4b95c19fca0ccc93d4eca2bb26a

Changelog: 

Fix the merge some more

I don't know whether this was me, kdiff3, or monotone on something.

Changes against parent 90563b555003eba18fcf35404c001c70b9f4c184

  patched  pidgin/gtkconv.c

-------------- next part --------------
============================================================
--- pidgin/gtkconv.c	213c8700c588884aec09c751864056924c5b8967
+++ pidgin/gtkconv.c	1100c8ea5ae0a3c2b2ad8f0b1fe26b8bfb1b8dfd
@@ -6320,6 +6320,8 @@ pidgin_conv_chat_update_user(PurpleConve
 		gtk_list_store_remove(GTK_LIST_STORE(model), &iter);
 		gtk_tree_row_reference_free(ref);
 		cbuddy->ui_data = NULL;
+	}
+
 	if (cbuddy)
 		add_chat_buddy_common(conv, cbuddy, NULL);
 }