diff options
| author | Fabrice Bellet <fabrice@bellet.info> | 2019-07-23 12:47:17 +0200 |
|---|---|---|
| committer | Fabrice Bellet <fabrice@bellet.info> | 2019-07-23 12:47:17 +0200 |
| commit | 2e06e3f6376d894062c6ee4940f3f3309ab76a46 (patch) | |
| tree | e54c2b2bae051924b2edf30d95a66b369c2f3538 | |
| parent | 4ea8c5657c7e8f62fb19be1ed3d84971bbd707fd (diff) | |
| download | pidgin-2e06e3f6376d894062c6ee4940f3f3309ab76a46.tar.gz | |
More fixes from pull request #523 review
| -rw-r--r-- | libpurple/media.h | 2 | ||||
| -rw-r--r-- | libpurple/media/backend-iface.c | 6 | ||||
| -rw-r--r-- | libpurple/media/backend-iface.h | 2 |
3 files changed, 7 insertions, 3 deletions
diff --git a/libpurple/media.h b/libpurple/media.h index bed885f408..af9febdb66 100644 --- a/libpurple/media.h +++ b/libpurple/media.h @@ -391,7 +391,7 @@ gboolean purple_media_set_decryption_parameters(PurpleMedia *media, * @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 */ diff --git a/libpurple/media/backend-iface.c b/libpurple/media/backend-iface.c index cede6a2e46..579c4d617b 100644 --- a/libpurple/media/backend-iface.c +++ b/libpurple/media/backend-iface.c @@ -231,7 +231,11 @@ purple_media_backend_set_require_encryption(PurpleMediaBackend *self, 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); } diff --git a/libpurple/media/backend-iface.h b/libpurple/media/backend-iface.h index 5d193f60f3..1450f5ceee 100644 --- a/libpurple/media/backend-iface.h +++ b/libpurple/media/backend-iface.h @@ -252,7 +252,7 @@ gboolean purple_media_backend_set_decryption_parameters(PurpleMediaBackend *self * @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 */ |