merge of '171a74c6fa72777e350ae8066ee08312ae9f4b91'

Sun, 10 May 2009 23:15:41 +0000

author
Paul Aurich <darkrain42@pidgin.im>
date
Sun, 10 May 2009 23:15:41 +0000
changeset 27090
ac7ff6ee0bee
parent 27089
171a74c6fa72 (diff)
parent 27087
3e84afbb5159 (current diff)
child 27091
329646e4b104

merge of '171a74c6fa72777e350ae8066ee08312ae9f4b91'
and '3e84afbb51592303d87ca0da25e0af9495502e46'

--- a/libpurple/protocols/jabber/google.c	Sun May 10 22:41:13 2009 +0000
+++ b/libpurple/protocols/jabber/google.c	Sun May 10 23:15:41 2009 +0000
@@ -735,7 +735,7 @@
 	g_free(to_name);
 	g_free(tos);
 	g_free(froms);
-	for (i = 0; i < count; i++)
+	for (i = 0; i < returned_count; i++)
 		g_free(subjects[i]);
 	g_free(subjects);
 	g_free(urls);

mercurial