# HG changeset patch
# User Eric Warmenhoven <eric@warmenhoven.org>
# Date 974359815 0
# Node ID b335c0ce305e67297dbdf31ca1d459c5f3cfe960
# Parent  40189d5443c03e76628cdafb4aa408424132e6eb
[gaim-migrate @ 1108]
wow, this was a problem

committer: Tailor Script <tailor@pidgin.im>

diff -r 40189d5443c0 -r b335c0ce305e src/buddy.c
--- a/src/buddy.c	Tue Nov 14 19:32:45 2000 +0000
+++ b/src/buddy.c	Thu Nov 16 07:30:15 2000 +0000
@@ -275,7 +275,7 @@
 			if ((g_slist_length(b->connlist) == 1) && (b->connlist->data == gc)) {
 				if (b->log_timer > 0)
 					gtk_timeout_remove(b->log_timer);
-				b->log_timer = -1;
+				b->log_timer = 0;
 				b->connlist = g_slist_remove(b->connlist, gc);
 				gtk_container_remove(GTK_CONTAINER(g->tree), b->item);
 				m = g->members = g_slist_remove(g->members, b);
@@ -342,7 +342,7 @@
 				m = g_slist_remove(m, b);
 				if (b->log_timer > 0)
 					gtk_timeout_remove(b->log_timer);
-				b->log_timer = -1;
+				b->log_timer = 0;
 				gtk_container_remove(GTK_CONTAINER(g->tree), b->item);
 				g_free(b->show);
 				g_free(b->name);
@@ -528,7 +528,7 @@
 					gs->members = g_slist_remove(gs->members, bs);
 					if (bs->log_timer > 0)
 						gtk_timeout_remove(bs->log_timer);
-					bs->log_timer = -1;
+					bs->log_timer = 0;
 					gtk_container_remove(GTK_CONTAINER(gs->tree), bs->item);
 					g_free(bs->show);
 					g_free(bs->name);
@@ -1405,14 +1405,16 @@
 static struct buddy_show *find_buddy_show(struct group_show *gs, char *name) {
 	GSList *m = gs->members;
 	struct buddy_show *b = NULL;
+	char *who = g_strdup(normalize(name));
 
 	while (m) {
 		b = (struct buddy_show *)m->data;
-		if (!strcmp(b->name, name))
+		if (!strcmp(normalize(b->name), who))
 			break;
 		b = NULL;
 		m = m->next;
 	}
+	g_free(who);
 
 	return b;
 }
@@ -1606,7 +1608,7 @@
 		gdk_bitmap_unref(bm);
 	}
 	gtk_timeout_remove(b->log_timer);
-	b->log_timer = -1;
+	b->log_timer = 0;
 	return 0;
 }
 
@@ -1765,7 +1767,7 @@
 			b->present = 2;
 			if (bs->log_timer > 0)
 				gtk_timeout_remove(bs->log_timer);
-			bs->log_timer = -1;
+			bs->log_timer = 0;
 			if (!g_slist_find(bs->connlist, gc))
 				bs->connlist = g_slist_append(bs->connlist, gc);
 			else
@@ -1782,7 +1784,7 @@
 					write_to_conv(c, tmp, WFLAG_SYSTEM, NULL);
 				}
 			}
-		} else if (bs->log_timer <= 0) {
+		} else if (bs->log_timer == 0) {
 			if (gc->prpl->list_icon)
 				xpm = (*gc->prpl->list_icon)(b->uc);
 			if (xpm == NULL)