# HG changeset patch
# User Mike Ruprecht <maiku@soc.pidgin.im>
# Date 1237459601 0
# Node ID 7e24c04ab5c9e23f8fbaf2fc423070216a10dec2
# Parent  95794e9acf71fe88797736bb20537aa7d8a5f1ab# Parent  3824cd706fa38b7bc43aebe311232abe9bb20bb1
merge of '932de261b2c091dd834f54518d4c9df53b9ad7ac'
     and 'ef1c8c06e832e807799e7e2785305b34f7a257b2'

diff -r 95794e9acf71 -r 7e24c04ab5c9 libpurple/protocols/jabber/jingle/session.c
--- a/libpurple/protocols/jabber/jingle/session.c	Thu Mar 19 10:24:10 2009 +0000
+++ b/libpurple/protocols/jabber/jingle/session.c	Thu Mar 19 10:46:41 2009 +0000
@@ -604,7 +604,7 @@
 	xmlnode *jingle = xmlnode_get_child(iq->node, "jingle");
 
 	if (reason != NULL) {
-		JabberIq *reason_node;
+		xmlnode *reason_node;
 		reason_node = xmlnode_new_child(jingle, "reason");
 		xmlnode_new_child(reason_node, reason);
 	}