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

Thu, 16 Jun 2016 23:52:59 -0500

author
Gary Kramlich <grim@reaperworld.com>
date
Thu, 16 Jun 2016 23:52:59 -0500
branch
release-2.x.y
changeset 37758
9aa6de025d0c
parent 37756
421e7b2020eb (current diff)
parent 37757
270e9f74aad0 (diff)
child 37775
98db0f80d005
child 37782
d37d62d692e4

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

Document a few more symbols that were added in 2.11.0

ChangeLog.API file | annotate | diff | comparison | revisions
--- a/ChangeLog.API	Fri Jun 17 01:37:49 2016 -0300
+++ b/ChangeLog.API	Thu Jun 16 23:52:59 2016 -0500
@@ -15,6 +15,8 @@
 		* 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
--- a/libpurple/media.h	Fri Jun 17 01:37:49 2016 -0300
+++ b/libpurple/media.h	Thu Jun 16 23:52:59 2016 -0500
@@ -406,6 +406,8 @@
  * @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);
--- a/libpurple/media/backend-iface.h	Fri Jun 17 01:37:49 2016 -0300
+++ b/libpurple/media/backend-iface.h	Thu Jun 16 23:52:59 2016 -0500
@@ -278,6 +278,8 @@
  * 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);

mercurial