changeset 12982:614ab5ffc6f9

[gaim-migrate @ 15335] Patch #1411391 from sadrul - fixes chat room user counts and a memleak committer: Tailor Script <tailor@pidgin.im>
author Stu Tomlinson <stu@nosnilmot.com>
date Sun, 22 Jan 2006 03:01:26 +0000
parents 880844bef520
children 92ae94619e2c
files src/gtkconv.c
diffstat 1 files changed, 4 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- 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);