pidgin/pidgin

Merged in default (pull request #673)

2020-03-13, Gary Kramlich
913a68cbf8b9
Parents 012857bbfc696ed394abeff1
Children d981cc89bf37
Merged in default (pull request #673)

A few tweaks to severely limit the warnings that are spit out when libpurple is compiled

Approved-by: Richard Laager
Approved-by: Elliott Sales de Andrade
2 files changed, 4 insertions(+), 1 deletions(-)
  • +4 -0
    libpurple/internal.h
  • +0 -1
    libpurple/media/backend-fs2.c
    • --- a/libpurple/internal.h Thu Mar 12 23:08:19 2020 -0500
    +++ b/libpurple/internal.h Fri Mar 13 22:57:27 2020 +0000
    @@ -28,6 +28,10 @@
    * @title: Internal definitions and includes
    */
    +#ifndef GLIB_VERSION_MIN_REQUIRED
    +#define GLIB_VERSION_MIN_REQUIRED (GLIB_VERSION_2_28)
    +#endif
    +
    #ifdef HAVE_CONFIG_H
    # include <config.h>
    #endif
    --- a/libpurple/media/backend-fs2.c Thu Mar 12 23:08:19 2020 -0500
    +++ b/libpurple/media/backend-fs2.c Fri Mar 13 22:57:27 2020 +0000
    @@ -2421,7 +2421,6 @@
    gboolean require_encryption)
    {
    PurpleMediaBackendFs2Stream *stream;
    - gboolean result;
    stream = get_stream(PURPLE_MEDIA_BACKEND_FS2(self), sess_id,
    participant);