# HG changeset patch
# User Stu Tomlinson <stu@nosnilmot.com>
# Date 1137898886 0
# Node ID 614ab5ffc6f98195bc301dc00de4d4aafea7a81d
# Parent  880844bef520c7751c3f65ca93b87f8d0b0ed81d
[gaim-migrate @ 15335]
Patch #1411391 from sadrul - fixes chat room user counts and a memleak

committer: Tailor Script <tailor@pidgin.im>

diff -r 880844bef520 -r 614ab5ffc6f9 src/gtkconv.c
--- a/src/gtkconv.c	Sat Jan 21 22:33:12 2006 +0000
+++ b/src/gtkconv.c	Sun Jan 22 03:01:26 2006 +0000
@@ -5030,8 +5030,7 @@
 	gtkconv = GAIM_GTK_CONVERSATION(conv);
 	gtkchat = gtkconv->u.chat;
 
-	num_users = g_list_length(gaim_conv_chat_get_users(chat)) -
-	            g_list_length(users);
+	num_users = g_list_length(gaim_conv_chat_get_users(chat));
 
 	for (l = users; l != NULL; l = l->next) {
 		model = gtk_tree_view_get_model(GTK_TREE_VIEW(gtkchat->list));
@@ -5106,7 +5105,10 @@
 	}
 
 	if (!gaim_conv_chat_find_user(chat, user))
+	{
+		g_free(alias);
 		return;
+	}
 
 	g_return_if_fail(alias != NULL);