Mercurial > pidgin
changeset 28288:5dad598188ed
merge of '6447eb03b5b0d21ec2d313005e95d66b4376eeae'
and 'e4372ae7e8d466825e2baad0ab63a4293bc258de'
author | maiku@pidgin.im |
---|---|
date | Wed, 23 Sep 2009 10:02:08 +0000 |
parents | e0a9b3e18c9d (diff) e8cd57c14643 (current diff) |
children | ad04e3ffb3d5 befc616a0bf5 |
files | |
diffstat | 1 files changed, 1 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- 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))