# HG changeset patch
# User maiku@pidgin.im
# Date 1253700128 0
# Node ID 5dad598188edfd1acdedf66cf3c2297ceecef2fb
# Parent  e0a9b3e18c9d087621f04db46a8be27320aa5713# Parent  e8cd57c146430fb6fd2bcdea96586384281e0c6c
merge of '6447eb03b5b0d21ec2d313005e95d66b4376eeae'
     and 'e4372ae7e8d466825e2baad0ab63a4293bc258de'

diff -r e8cd57c14643 -r 5dad598188ed libpurple/protocols/jabber/jingle/jingle.c
--- a/libpurple/protocols/jabber/jingle/jingle.c	Tue Sep 22 06:30:04 2009 +0000
+++ b/libpurple/protocols/jabber/jingle/jingle.c	Wed Sep 23 10:02:08 2009 +0000
@@ -115,7 +115,7 @@
 		const gchar *creator = xmlnode_get_attrib(content, "creator");
 		JingleContent *local_content = jingle_session_find_content(session, name, creator);
 
-		if (content != NULL) {
+		if (local_content != NULL) {
 			const gchar *senders = xmlnode_get_attrib(content, "senders");
 			gchar *local_senders = jingle_content_get_senders(local_content);
 			if (strcmp(senders, local_senders))