summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Aurich <darkrain42@pidgin.im>2009-05-14 21:34:38 +0000
committerPaul Aurich <darkrain42@pidgin.im>2009-05-14 21:34:38 +0000
commitb6fcd4d8d60efd919b5ce55aba0ac5d3a2eb467a (patch)
tree6111ec336c200f8ebc03965a5731c44ae40ba7ae
parenta1a345487c37f4992916155385561376577b7268 (diff)
parent762023bea8bb64211079e668f2b8d5de32abcada (diff)
downloadpidgin-b6fcd4d8d60efd919b5ce55aba0ac5d3a2eb467a.tar.gz
merge of '64c8fc8c7433fc55c2fba324f2aedeba592a2d22'
and '721111ae10000139d45c57b83af64308e8851dcf'
-rw-r--r--libpurple/protocols/jabber/presence.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/libpurple/protocols/jabber/presence.c b/libpurple/protocols/jabber/presence.c
index ddc215dc0c..1c6c79732d 100644
--- a/libpurple/protocols/jabber/presence.c
+++ b/libpurple/protocols/jabber/presence.c
@@ -674,7 +674,6 @@ void jabber_presence_parse(JabberStream *js, xmlnode *packet)
if (!jid->resource) {
jabber_id_free(jid);
g_free(avatar_hash);
- g_free(nickname);
g_free(status);
return;
}