Mercurial > pidgin.yaz
changeset 31812:539aa44be788
media: allow obtaining active local and remote candidates. Closes #11830
| author | Marcus Lundblad <ml@update.uu.se> |
|---|---|
| date | Sat, 20 Nov 2010 13:37:33 +0000 |
| parents | 41f1e44ad4b5 |
| children | ea2a155b4439 |
| files | ChangeLog ChangeLog.API libpurple/media.c libpurple/media.h |
| diffstat | 4 files changed, 10 insertions(+), 14 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Sat Nov 20 13:02:08 2010 +0000 +++ b/ChangeLog Sat Nov 20 13:37:33 2010 +0000 @@ -1,5 +1,9 @@ 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)
--- a/ChangeLog.API Sat Nov 20 13:02:08 2010 +0000 +++ b/ChangeLog.API Sat Nov 20 13:37:33 2010 +0000 @@ -4,6 +4,8 @@ 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 (??/??/????):
--- a/libpurple/media.c Sat Nov 20 13:02:08 2010 +0000 +++ b/libpurple/media.c Sat Nov 20 13:37:33 2010 +0000 @@ -1151,12 +1151,6 @@ #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 @@ return NULL; #endif } -#endif gboolean purple_media_set_remote_codecs(PurpleMedia *media, const gchar *sess_id,
--- a/libpurple/media.h Sat Nov 20 13:02:08 2010 +0000 +++ b/libpurple/media.h Sat Nov 20 13:37:33 2010 +0000 @@ -230,12 +230,6 @@ 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 @@ * 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 @@ * 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.