Mercurial > pidgin.yaz

changeset 25681:6268758d029a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Send negotiated codecs in session-accept opposed to all local codecs.
author Mike Ruprecht <maiku@soc.pidgin.im>
date Sat, 07 Jun 2008 03:43:45 +0000
parents b5a00ddb7077
children bdc09d3164df
files libpurple/protocols/jabber/jingle.c
diffstat 1 files changed, 19 insertions(+), 15 deletions(-) [+]
line wrap: on
line diff
--- a/libpurple/protocols/jabber/jingle.c	Sat Jun 07 03:14:52 2008 +0000
+++ b/libpurple/protocols/jabber/jingle.c	Sat Jun 07 03:43:45 2008 +0000
@@ -435,14 +435,9 @@
 
 static void
 jabber_jingle_session_add_payload_types(const JingleSessionContent *jsc,
-					xmlnode *description)
+					xmlnode *description,
+					GList *codecs)
 {
-	JingleSession *session = jabber_jingle_session_content_get_session(jsc);
-	PurpleMedia *media = jabber_jingle_session_get_media(session);
-	/* should this be local_codecs or negotiated-codecs? */
-	GList *codecs = purple_media_get_local_codecs(media,
-			jabber_jingle_session_content_get_name(jsc));
-
 	for (; codecs ; codecs = codecs->next) {
 		FsCodec *codec = (FsCodec*)codecs->data;
 		char id[8], clockrate[10], channels[10];
@@ -457,7 +452,6 @@
 		xmlnode_set_attrib(payload, "clockrate", clockrate);
 		xmlnode_set_attrib(payload, "channels", channels);
 	}
-	fs_codec_list_destroy(codecs);
 }
 
 static xmlnode *
@@ -680,17 +674,21 @@
 
 	for (; contents; contents = contents->next) {
 		JingleSessionContent *jsc = contents->data;
-		const gchar *session_name = jabber_jingle_session_content_get_name(jsc);
+		const gchar *content_name = jabber_jingle_session_content_get_name(jsc);
 		xmlnode *content = jabber_jingle_session_add_content(jsc, jingle);
 		xmlnode *description = jabber_jingle_session_add_description(jsc, content);
 		xmlnode *transport = jabber_jingle_session_add_transport(jsc, content);
-		if (jabber_jingle_session_content_is_type(jsc, JINGLE_RTP))
-			jabber_jingle_session_add_payload_types(jsc, description);
+		if (jabber_jingle_session_content_is_type(jsc, JINGLE_RTP)) {
+			GList *codecs = purple_media_get_negotiated_codecs(media,
+									   content_name);
+			jabber_jingle_session_add_payload_types(jsc, description, codecs);
+			fs_codec_list_destroy(codecs);
+		}
 		if (jabber_jingle_session_content_is_transport_type(jsc, TRANSPORT_ICEUDP)) {
 			jabber_jingle_session_add_candidate_iceudp(transport, 
-					purple_media_get_local_candidate(media, session_name,
+					purple_media_get_local_candidate(media, content_name,
 									 remote_jid),
-					purple_media_get_remote_candidate(media, session_name,
+					purple_media_get_remote_candidate(media, content_name,
 									  remote_jid));
 		}
 	}
@@ -724,8 +722,14 @@
 		JingleSessionContent *jsc = contents->data;
 		xmlnode *content = jabber_jingle_session_add_content(jsc, jingle);
 		xmlnode *description = jabber_jingle_session_add_description(jsc, content);
-		if (jabber_jingle_session_content_is_type(jsc, JINGLE_RTP))
-			jabber_jingle_session_add_payload_types(jsc, description);
+		if (jabber_jingle_session_content_is_type(jsc, JINGLE_RTP)) {
+			PurpleMedia *media = jabber_jingle_session_get_media(session);
+			const gchar *content_name =
+					jabber_jingle_session_content_get_name(jsc);
+			GList *codecs = purple_media_get_local_codecs(media, content_name);
+			jabber_jingle_session_add_payload_types(jsc, description, codecs);
+			fs_codec_list_destroy(codecs);
+		}
 		jabber_jingle_session_add_transport(jsc, content);
 	}