/soc/2015/mmcc/main: 2705aab56ffa: remove deprecated GnuTLS memo...

[Michael McConville]

Changeset: 2705aab56ffa529fbd02517be2e9070c6658f46a
Author:	 Michael McConville <mmcconville at mykolab.com>
Date:	 2015-07-03 10:01 -0700
Branch:	 default
URL: https://hg.pidgin.im/soc/2015/mmcc/main/rev/2705aab56ffa

Description:

remove deprecated GnuTLS memory function definitions

diffstat:

 libpurple/plugins/ssl/ssl-gnutls.c |  14 --------------
 1 files changed, 0 insertions(+), 14 deletions(-)

diffs (24 lines):

diff --git a/libpurple/plugins/ssl/ssl-gnutls.c b/libpurple/plugins/ssl/ssl-gnutls.c
--- a/libpurple/plugins/ssl/ssl-gnutls.c
+++ b/libpurple/plugins/ssl/ssl-gnutls.c
@@ -171,20 +171,6 @@ ssl_gnutls_init_gnutls(void)
 	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);