changeset
merge of '3edd01e538235b67296b3aef780d5c47515bd45b'
Wed, 23 Sep 2009 10:02:08 +0000
- author
- Michael Ruprecht <maiku@pidgin.im>
- date
- Wed, 23 Sep 2009 10:02:08 +0000
- changeset 28579
- 28cef7bf2835
- parent 28571
- 3edd01e53823 (diff)
- parent 28578
- 74b2a6dba113 (current diff)
- child 28580
- 061c2827b3f5
- child 28695
- ee4ea6de47e3
merge of '3edd01e538235b67296b3aef780d5c47515bd45b'
and '74b2a6dba113a6e6fd9703335ad10e23d125274a'
--- 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))
