qulogic/pidgin

More fixes from pull request #523 review
purple-media-require-encryption-api-addition
2019-07-23, Fabrice Bellet
2fd625129047
Parents 81dd8064aa48
Children d4d7095686cfc51dc9f90d2f
More fixes from pull request #523 review
3 files changed, 7 insertions(+), 3 deletions(-)
  • +1 -1
    libpurple/media.h
  • +5 -1
    libpurple/media/backend-iface.c
  • +1 -1
    libpurple/media/backend-iface.h
    • --- 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
    */