/pidgin/main: 9aa6de025d0c: Merged in rw_grim/pidgin/release-2.x...

[Gary Kramlich]

Changeset: 9aa6de025d0ccc5c7e2f2a6f7e53b79b96cd6a0f
Author:	 Gary Kramlich <grim at reaperworld.com>
Date:	 2016-06-16 23:52 -0500
Branch:	 release-2.x.y
URL: https://hg.pidgin.im/pidgin/main/rev/9aa6de025d0c

Description:

Merged in rw_grim/pidgin/release-2.x.y (pull request #79)

Document a few more symbols that were added in 2.11.0

diffstat:

 ChangeLog.API                   |  2 ++
 libpurple/media.h               |  2 ++
 libpurple/media/backend-iface.h |  2 ++
 3 files changed, 6 insertions(+), 0 deletions(-)

diffs (36 lines):

diff --git a/ChangeLog.API b/ChangeLog.API
--- a/ChangeLog.API
+++ b/ChangeLog.API
@@ -15,6 +15,8 @@ version 2.11.0:
 		* purple_media_set_decryption_parameters
 		* purple_xfer_write_file
 		* purple_xfer_read_file
+		* purple_media_set_send_rtcp_mux
+		* purple_media_backend_set_send_rtcp_mux
 
 version 2.10.12:
 	* No changes
diff --git a/libpurple/media.h b/libpurple/media.h
--- a/libpurple/media.h
+++ b/libpurple/media.h
@@ -406,6 +406,8 @@ gboolean purple_media_codecs_ready(Purpl
  * @paran send_rtcp_mux Whether to enable the rtcp-mux option
  *
  * @return @c TRUE RTCP-Mux was set successfully, or @c FALSE otherwise.
+ *
+ * @since 2.11.0
  */
 gboolean purple_media_set_send_rtcp_mux(PurpleMedia *media,
 		const gchar *sess_id, const gchar *participant, gboolean send_rtcp_mux);
diff --git a/libpurple/media/backend-iface.h b/libpurple/media/backend-iface.h
--- a/libpurple/media/backend-iface.h
+++ b/libpurple/media/backend-iface.h
@@ -278,6 +278,8 @@ const gchar **purple_media_backend_get_a
  * Controls whether or not the RTCP should be muxed with the RTP
  *
  * Returns: True if set successfully, otherwise False.
+ *
+ * @since 2.11.0
  */
 gboolean purple_media_backend_set_send_rtcp_mux(PurpleMediaBackend *self,
 		const gchar *sess_id, const gchar *participant, gboolean send_rtcp_mux);