qulogic/pidgin

Merged in dequisdequis/pidgin/release-2.x.y (pull request #156)
release-2.x.y
2016-10-06, Gary Kramlich
2beb4e2c7c92
Parents a696332798b9c8ea044247ac
Children f9edea9d7da7
Merged in dequisdequis/pidgin/release-2.x.y (pull request #156)

Remove call to the deprecated and stubbed gnutls_global_set_mem_functions().
1 files changed, 0 insertions(+), 14 deletions(-)
  • +0 -14
    libpurple/plugins/ssl/ssl-gnutls.c
    • --- a/libpurple/plugins/ssl/ssl-gnutls.c Thu Oct 06 10:05:38 2016 -0400
    +++ b/libpurple/plugins/ssl/ssl-gnutls.c Thu Oct 06 21:31:05 2016 -0500
    @@ -69,20 +69,6 @@
    const char *debug_level;
    const char *host_priorities_str;
    - /* Configure GnuTLS to use glib memory management */
    - /* I expect that this isn't really necessary, but it may prevent
    - some bugs */
    - /* TODO: It may be necessary to wrap this allocators for GnuTLS.
    - If there are strange bugs, perhaps look here (yes, I am a
    - hypocrite) */
    - gnutls_global_set_mem_functions(
    - (gnutls_alloc_function) g_malloc, /* malloc */
    - (gnutls_alloc_function) g_malloc, /* secure malloc */
    - NULL, /* mem_is_secure */
    - (gnutls_realloc_function) g_realloc, /* realloc */
    - (gnutls_free_function) g_free /* free */
    - );
    -
    debug_level = g_getenv("PURPLE_GNUTLS_DEBUG");
    if (debug_level) {
    int level = atoi(debug_level);