# HG changeset patch
# User Eric Warmenhoven <eric@warmenhoven.org>
# Date 1004338069 0
# Node ID 7a3f7aebd4e50512fe25e34544db4d88a5c49ed9
# Parent  b740a33875c3a0be17d113622dc1e7b7f6ab6bc9
[gaim-migrate @ 2647]
hi.

committer: Tailor Script <tailor@pidgin.im>

diff -r b740a33875c3 -r 7a3f7aebd4e5 src/buddy_chat.c
--- a/src/buddy_chat.c	Sun Oct 28 09:11:51 2001 +0000
+++ b/src/buddy_chat.c	Mon Oct 29 06:47:49 2001 +0000
@@ -934,11 +934,16 @@
 
 		g_snprintf(tmp, sizeof(tmp), "X %s", name);
 		list_item = gtk_list_item_new_with_label(tmp);
-	} else if (ignored(b, new)) {
-		g_snprintf(tmp, sizeof(tmp), "X %s", name);
-		list_item = gtk_list_item_new_with_label(tmp);
-	} else
+	} else {
+		if ((ign = ignored(b, new)) != NULL) {
+			/* if they weren't ignored and change to someone who is ignored,
+			 * assume it's someone else. that may seem a little backwards but
+			 * it's better when it *is* actually someone else. Sorry Sean. */
+			g_free(ign);
+			b->ignored = g_list_remove(b->ignored, ign);
+		}
 		list_item = gtk_list_item_new_with_label(name);
+	}
 
 	gtk_object_set_user_data(GTK_OBJECT(list_item), name);
 	gtk_signal_connect(GTK_OBJECT(list_item), "button_press_event",