# HG changeset patch
# User Paul Aurich <paul@darkrain42.org>
# Date 1309120623 0
# Node ID e0856c50cdd8dba844233b47965990d2a30bd2e2
# Parent  f2a3c59fc4a61595693073a82b1a12efbc4d9a5d
Fix the merge some more

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

diff -r f2a3c59fc4a6 -r e0856c50cdd8 pidgin/gtkconv.c
--- a/pidgin/gtkconv.c	Sat Jun 25 19:56:59 2011 +0000
+++ b/pidgin/gtkconv.c	Sun Jun 26 20:37:03 2011 +0000
@@ -6320,6 +6320,8 @@
 		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);
 }