[Gaim-commits] CVS: gaim/src buddy_chat.c,1.127,1.128

[Eric W. <war...@us...>]

Update of /cvsroot/gaim/gaim/src
In directory usw-pr-cvs1:/tmp/cvs-serv23010

Modified Files:
	buddy_chat.c 
Log Message:
hi.


Index: buddy_chat.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/buddy_chat.c,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -d -r1.127 -r1.128
--- buddy_chat.c	2001/10/28 06:26:34	1.127
+++ buddy_chat.c	2001/10/29 06:47:49	1.128
@@ -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",