changeset 25611:415803efb8b7

merge of '65a7d608054498ee4f5752fe003c5e19dd47758d' and 'f79b498a9d29cfc60c9b2db90fb0976afec6b756'
author Paul Aurich <paul@darkrain42.org>
date Thu, 14 May 2009 21:34:38 +0000
parents 3c1022fd4893 (diff) a81f75025e14 (current diff)
children c269f065b8af
files
diffstat 1 files changed, 0 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/libpurple/protocols/jabber/presence.c	Thu May 14 21:17:11 2009 +0000
+++ b/libpurple/protocols/jabber/presence.c	Thu May 14 21:34:38 2009 +0000
@@ -674,7 +674,6 @@
 			if (!jid->resource) {
 				jabber_id_free(jid);
 				g_free(avatar_hash);
-				g_free(nickname);
 				g_free(status);
 				return;
 			}