pidgin.next.minor: 5806c0bc: media: allow obtaining active local and ...

[malu at pidgin.im]

----------------------------------------------------------------------
Revision: 5806c0bc47c791300ede51ab92336dd817bd149c
Parent:   a367d231a026c75ed57a9483ea6bdbcff34e859a
Author:   malu at pidgin.im
Date:     11/20/10 08:37:33
Branch:   im.pidgin.pidgin.next.minor
URL: http://d.pidgin.im/viewmtn/revision/info/5806c0bc47c791300ede51ab92336dd817bd149c

Changelog: 

media: allow obtaining active local and remote candidates. Closes #11830

Changes against parent a367d231a026c75ed57a9483ea6bdbcff34e859a

  patched  ChangeLog
  patched  ChangeLog.API
  patched  libpurple/media.c
  patched  libpurple/media.h

-------------- next part --------------
============================================================
--- ChangeLog	c724beb74b527ee89cd5ba07cebad76b81a0eea9
+++ ChangeLog	5c9ca71789364623c00a66f90e60f7782cf8fc4a
@@ -1,5 +1,9 @@ Pidgin and Finch: The Pimpin' Penguin IM
 Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul
 
+version 2.8.0 (??/??/????):
+  libpurple
+  * media: Allow obtaining active local and remote candidates. (#11830)
+
 version 2.7.6 (??/??/????):
 	MSN:
 	* Added support for MSNP16, including Multiple Points of Presence (MPOP)
============================================================
--- ChangeLog.API	3b4d1e3215db403c90b7be9c106444346f344a71
+++ ChangeLog.API	7021a0e97abdfe7ae9d3582e3c5a52c2cbec1eee
@@ -4,6 +4,8 @@ version 2.8.0 (??/??/????):
 	libpurple:
 		Added:
 		* purple_notify_user_info_add_pair_plaintext
+		* purple_media_get_active_local_candidates
+		* purple_media_get_active_remote_candidates
 
 version 2.7.6 (??/??/????):
 
============================================================
--- libpurple/media.c	d6492d3cbe6800246798996e987df68036e3ef0d
+++ libpurple/media.c	c8c8d388f61dccd01098aa3d9887aa8346c269cc
@@ -1151,12 +1151,6 @@ purple_media_add_remote_candidates(Purpl
 #endif
 }
 
-#if 0
-/*
- * These two functions aren't being used and I'd rather not lock in the API
- * until they are needed. If they ever are.
- */
-
 GList *
 purple_media_get_active_local_candidates(PurpleMedia *media,
 		const gchar *sess_id, const gchar *participant)
@@ -1186,7 +1180,6 @@ purple_media_get_active_remote_candidate
 	return NULL;
 #endif
 }
-#endif
 
 gboolean
 purple_media_set_remote_codecs(PurpleMedia *media, const gchar *sess_id,
============================================================
--- libpurple/media.h	cc807b528f43992d96c9fe19e139a0aaba4f8c2e
+++ libpurple/media.h	7708bb2947aaf73f120743f188942a02e9c96023
@@ -230,12 +230,6 @@ GList *purple_media_get_local_candidates
 					 const gchar *sess_id,
 					 const gchar *participant);
 
-#if 0
-/*
- * These two functions aren't being used and I'd rather not lock in the API
- * until they are needed. If they ever are.
- */
-
 /**
  * Gets the active local candidates for the stream.
  *
@@ -245,6 +239,8 @@ GList *purple_media_get_local_candidates
  *                    from.
  *
  * @return The active candidates retrieved.
+ *
+ * @since 2.8.0
  */
 GList *purple_media_get_active_local_candidates(PurpleMedia *media,
 		const gchar *sess_id, const gchar *participant);
@@ -258,10 +254,11 @@ GList *purple_media_get_active_local_can
  *                    from.
  *
  * @return The remote candidates retrieved.
+ *
+ * @since 2.8.0
  */
 GList *purple_media_get_active_remote_candidates(PurpleMedia *media,
 		const gchar *sess_id, const gchar *participant);
-#endif
 
 /**
  * Sets remote candidates from the stream.