Mercurial > pidgin3 / changeset

--- a/libpurple/media.h	Sat Jul 20 12:07:03 2019 +0200
+++ b/libpurple/media.h	Tue Jul 23 12:47:17 2019 +0200
@@ -391,7 +391,7 @@
  * @param media The media object to find the session in.
  * @param sess_id The id of the session to set parameters of.
  * @param participant The participant of the session to set parameters of.
- * @param require-encryption TRUE if the media requires encryption.
+ * @param require_encryption TRUE if the media requires encryption.
  *
  * @since 2.14.0
  */

--- a/libpurple/media/backend-iface.c	Sat Jul 20 12:07:03 2019 +0200
+++ b/libpurple/media/backend-iface.c	Tue Jul 23 12:47:17 2019 +0200
@@ -231,7 +231,11 @@
 
 	g_return_val_if_fail(PURPLE_IS_MEDIA_BACKEND(self), FALSE);
 	backend_iface = PURPLE_MEDIA_BACKEND_GET_INTERFACE(self);
-	g_return_val_if_fail(backend_iface->set_require_encryption, FALSE);
+
+	if (!backend_iface->set_require_encryption) {
+		return FALSE;
+	}
+
 	return backend_iface->set_require_encryption(self,
 			sess_id, participant, require_encryption);
 }

--- a/libpurple/media/backend-iface.h	Sat Jul 20 12:07:03 2019 +0200
+++ b/libpurple/media/backend-iface.h	Tue Jul 23 12:47:17 2019 +0200
@@ -252,7 +252,7 @@
  * @param self The media object to find the session in.
  * @param sess_id The id of the session to set parameters of.
  * @param participant The participant of the session to set parameters of.
- * @param require-encryption TRUE if the media requires encryption.
+ * @param require_encryption TRUE if the media requires encryption.
  *
  * @since 2.14.0
  */