Mercurial > pidgin

diff libpurple/protocols/jabber/jingle/rtp.c @ 26371:12c7db418c3e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove purple_media_accept.
author Mike Ruprecht <maiku@soc.pidgin.im>
date Mon, 30 Mar 2009 01:06:44 +0000
parents 2862fee7acf2
children bea334b214fa
line wrap: on
line diff
--- a/libpurple/protocols/jabber/jingle/rtp.c	Mon Mar 30 00:55:29 2009 +0000
+++ b/libpurple/protocols/jabber/jingle/rtp.c	Mon Mar 30 01:06:44 2009 +0000
@@ -743,11 +743,10 @@
 			purple_media_add_remote_candidates(media,
 					name, remote_jid, candidates);
 
-			/* This needs to be for the entire session, not a single content */
-			/* very hacky */
-			if (action == JINGLE_SESSION_ACCEPT &&
-					xmlnode_get_next_twin(xmlcontent) == NULL)
-				purple_media_accept(media);
+			if (action == JINGLE_SESSION_ACCEPT)
+				purple_media_stream_info(media,
+						PURPLE_MEDIA_INFO_ACCEPT,
+						name, remote_jid, FALSE);
 
 			g_free(remote_jid);
 			g_free(name);