# HG changeset patch
# User Daniel Atallah <daniel.atallah@gmail.com>
# Date 1171565956 0
# Node ID 37d9f44c7de1629b5fdc701f1d7d871cdbdbd646
# Parent  026f9c6cc9425654e27ef2499954ded9b3c2c256# Parent  baec426702461c45c2a26786169c657ebb212c35
merge of '0118224968af798e258158653762d557de01c916'
     and '11536c727e00c07df8769130ad28e04ac5d60462'

diff -r 026f9c6cc942 -r 37d9f44c7de1 libpurple/protocols/jabber/parser.c
--- a/libpurple/protocols/jabber/parser.c	Thu Feb 15 18:19:51 2007 +0000
+++ b/libpurple/protocols/jabber/parser.c	Thu Feb 15 18:59:16 2007 +0000
@@ -54,9 +54,10 @@
 				js->protocol_version = JABBER_PROTO_1_0;
 				g_free(attrib);
 			} else if(!xmlStrcmp(attributes[i], (xmlChar*) "id")) {
-				if(js->stream_id)
-					g_free(js->stream_id);
+				g_free(js->stream_id);
 				js->stream_id = attrib;
+			} else {
+				g_free(attrib);	
 			}
 		}
 		if(js->protocol_version == JABBER_PROTO_0_9)