Combine get_*_codecs functions to mirror Farsight 2.maiku.vv

4 files changed, 6 insertions, 25 deletions

diff --git a/libpurple/media.c b/libpurple/media.c
index 7fd5dccaf9..27e11c56bc 100644
--- a/libpurple/media.c
+++ b/libpurple/media.c
@@ -1249,7 +1249,7 @@ purple_media_get_session_type(PurpleMedia *media, const gchar *sess_id)
 }
 /* XXX: Should wait until codecs-ready is TRUE before using this function */
 GList *
-purple_media_get_local_codecs(PurpleMedia *media, const gchar *sess_id)
+purple_media_get_codecs(PurpleMedia *media, const gchar *sess_id)
 {
 	GList *codecs;
 	g_object_get(G_OBJECT(purple_media_get_session(media, sess_id)->session),
@@ -1264,15 +1264,6 @@ purple_media_get_local_candidates(PurpleMedia *media, const gchar *sess_id, cons
 	return fs_candidate_list_copy(
 			purple_media_session_get_local_candidates(session, name));
 }
-/* XXX: Should wait until codecs-ready is TRUE before using this function */
-GList *
-purple_media_get_negotiated_codecs(PurpleMedia *media, const gchar *sess_id)
-{
-	PurpleMediaSession *session = purple_media_get_session(media, sess_id);
-	GList *codec_intersection;
-	g_object_get(session->session, "codecs", &codec_intersection, NULL);
-	return codec_intersection;
-}
 
 void
 purple_media_add_remote_candidates(PurpleMedia *media, const gchar *sess_id,
diff --git a/libpurple/media.h b/libpurple/media.h
index 813f3498c7..f181975a41 100644
--- a/libpurple/media.h
+++ b/libpurple/media.h
@@ -375,24 +375,14 @@ void purple_media_remove_stream(PurpleMedia *media, const gchar *sess_id, const
 PurpleMediaSessionType purple_media_get_session_type(PurpleMedia *media, const gchar *sess_id);
 
 /**
- * Gets the negotiated codecs from a session.
+ * Gets the codecs from a session.
  *
  * @param media The media object to find the session in.
- * @param sess_id The session id of the session to get the negotiated codecs from.
+ * @param sess_id The session id of the session to get the codecs from.
  *
  * @return The retreieved codecs.
  */
-GList *purple_media_get_negotiated_codecs(PurpleMedia *media, const gchar *sess_id);
-
-/**
- * Gets the local codecs from a session.
- *
- * @param media The media object to find the session in.
- * @param sess_id The session id of the session to get the local codecs from.
- *
- * @return The retreieved codecs.
- */
-GList *purple_media_get_local_codecs(PurpleMedia *media, const gchar *sess_id);
+GList *purple_media_get_codecs(PurpleMedia *media, const gchar *sess_id);
 
 /**
  * Adds remote candidates to the stream.
diff --git a/libpurple/protocols/jabber/google.c b/libpurple/protocols/jabber/google.c
index 30acbeb1b6..36c6c0b0e8 100644
--- a/libpurple/protocols/jabber/google.c
+++ b/libpurple/protocols/jabber/google.c
@@ -102,7 +102,7 @@ static void
 google_session_send_accept(GoogleSession *session)
 {
 	xmlnode *sess, *desc, *payload;
-	GList *codecs = purple_media_get_negotiated_codecs(session->media, "google-voice");
+	GList *codecs = purple_media_get_codecs(session->media, "google-voice");
 	JabberIq *iq = jabber_iq_new(session->js, JABBER_IQ_SET);
 
 	xmlnode_set_attrib(iq->node, "to", session->remote_jid);
diff --git a/libpurple/protocols/jabber/jingle/rtp.c b/libpurple/protocols/jabber/jingle/rtp.c
index 18f4dd5c43..be3f5933a1 100644
--- a/libpurple/protocols/jabber/jingle/rtp.c
+++ b/libpurple/protocols/jabber/jingle/rtp.c
@@ -523,7 +523,7 @@ jingle_rtp_to_xml_internal(JingleContent *rtp, xmlnode *content, JingleActionTyp
 		PurpleMedia *media = jingle_rtp_get_media(session);
 		gchar *media_type = jingle_rtp_get_media_type(rtp);
 		gchar *name = jingle_content_get_name(rtp);
-		GList *codecs = purple_media_get_local_codecs(media, name);
+		GList *codecs = purple_media_get_codecs(media, name);
 
 		xmlnode_set_attrib(description, "media", media_type);