Mercurial > pidgin
diff libpurple/protocols/jabber/jingle/jingle.c @ 24949:1a2d446cb8a0
Fix support for audio and video (at the same time) sessions.
| author | Mike Ruprecht <maiku@soc.pidgin.im> |
|---|---|
| date | Mon, 03 Nov 2008 03:07:07 +0000 |
| parents | bd598b606ca4 |
| children | bee5ab815291 |
line wrap: on
line diff
--- a/libpurple/protocols/jabber/jingle/jingle.c Sun Nov 02 21:00:46 2008 +0000 +++ b/libpurple/protocols/jabber/jingle/jingle.c Mon Nov 03 03:07:07 2008 +0000 @@ -213,12 +213,13 @@ for (; content; content = xmlnode_get_next_twin(content)) { const gchar *name = xmlnode_get_attrib(content, "name"); const gchar *creator = xmlnode_get_attrib(content, "creator"); - JingleContent *content = jingle_session_find_content(session, name, creator); - if (content == NULL) { + JingleContent *parsed_content = + jingle_session_find_content(session, name, creator); + if (parsed_content == NULL) { purple_debug_error("jingle", "Error parsing content\n"); /* XXX: send error */ } else { - jingle_content_handle_action(content, jingle, + jingle_content_handle_action(parsed_content, content, JINGLE_SESSION_ACCEPT); } } @@ -243,7 +244,7 @@ /* XXX: send error */ } else { jingle_session_add_content(session, parsed_content); - jingle_content_handle_action(parsed_content, jingle, + jingle_content_handle_action(parsed_content, content, JINGLE_SESSION_INITIATE); } } @@ -287,12 +288,13 @@ for (; content; content = xmlnode_get_next_twin(content)) { const gchar *name = xmlnode_get_attrib(content, "name"); const gchar *creator = xmlnode_get_attrib(content, "creator"); - JingleContent *content = jingle_session_find_content(session, name, creator); - if (content == NULL) { + JingleContent *parsed_content = + jingle_session_find_content(session, name, creator); + if (parsed_content == NULL) { purple_debug_error("jingle", "Error parsing content\n"); /* XXX: send error */ } else { - jingle_content_handle_action(content, jingle, + jingle_content_handle_action(parsed_content, content, JINGLE_TRANSPORT_INFO); } }