# HG changeset patch
# User Stu Tomlinson <stu@nosnilmot.com>
# Date 1177164265 0
# Node ID 5f536fc60d14ce151c6b499fcf9e3c838779e2b6
# Parent  3974d12a56ecbc51c68bcdd0105b1b1204a31003# Parent  83bef7e6c410570075cefd97a783d6574dc23584
merge of '8729bdb23df9db489717da7acedcec3ffe02469a'
     and 'b9b2646237a4c00fcaf09cd9de4eaa38266eb9b7'

diff -r 83bef7e6c410 -r 5f536fc60d14 pidgin/gtkconv.c
--- a/pidgin/gtkconv.c	Sat Apr 21 14:00:19 2007 +0000
+++ b/pidgin/gtkconv.c	Sat Apr 21 14:04:25 2007 +0000
@@ -1416,35 +1416,19 @@
 	g_free(real_who);
 }
 
+static void pidgin_conv_chat_update_user(PurpleConversation *conv, const char *user);
+
 static void
 ignore_cb(GtkWidget *w, PidginConversation *gtkconv)
 {
 	PurpleConversation *conv = gtkconv->active_conv;
-	PidginChatPane *gtkchat;
-	PurpleConvChatBuddy *cbuddy;
 	PurpleConvChat *chat;
-	PurpleConvChatBuddyFlags flags;
-	GtkTreeIter iter;
-	GtkTreeModel *model;
-	GtkTreeSelection *sel;
-	char *name;
-	char *alias;
-
-	chat    = PURPLE_CONV_CHAT(conv);
-	gtkchat = gtkconv->u.chat;
-
-	model = gtk_tree_view_get_model(GTK_TREE_VIEW(gtkchat->list));
-	sel   = gtk_tree_view_get_selection(GTK_TREE_VIEW(gtkchat->list));
-
-	if (gtk_tree_selection_get_selected(sel, NULL, &iter)) {
-		gtk_tree_model_get(GTK_TREE_MODEL(model), &iter,
-						   CHAT_USERS_NAME_COLUMN, &name,
-						   CHAT_USERS_ALIAS_COLUMN, &alias,
-						   CHAT_USERS_FLAGS_COLUMN, &flags,
-						   -1);
-		gtk_list_store_remove(GTK_LIST_STORE(model), &iter);
-	}
-	else
+	const char *name;
+
+	chat = PURPLE_CONV_CHAT(conv);
+	name = g_object_get_data(G_OBJECT(w), "user_data");
+
+	if (name == NULL)
 		return;
 
 	if (purple_conv_chat_is_user_ignored(chat, name))
@@ -1452,11 +1436,7 @@
 	else
 		purple_conv_chat_ignore(chat, name);
 
-	cbuddy = purple_conv_chat_cb_new(name, alias, flags);
-
-	add_chat_buddy_common(conv, cbuddy, NULL);
-	g_free(name);
-	g_free(alias);
+	pidgin_conv_chat_update_user(conv, name);
 }
 
 static void