changeset 7863:6ee2fe9bb74e

[gaim-migrate @ 8517] "Patch 2: ssl-plugins.patch Other plugins might need to use the NSS/GNUTLS libraries, which shouldn't be initialized multiple times in the same thread (at least NSS says this is a bad thing to do). This patch enables other plugins to load either the NSS or GNUTLS plugin, and a) have them init on load, rather when sslconn inits them b) have them not stomp on each other if the other one has already loaded." --Bill Tompkins (obobo) committer: Tailor Script <tailor@pidgin.im>
author Luke Schierer <lschiere@pidgin.im>
date Sun, 14 Dec 2003 16:46:28 +0000
parents 01e6e9c46a01
children dc80d4e5c3b0
files src/sslconn.c
diffstat 1 files changed, 5 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/src/sslconn.c	Sun Dec 14 16:35:35 2003 +0000
+++ b/src/sslconn.c	Sun Dec 14 16:46:28 2003 +0000
@@ -32,8 +32,7 @@
 ssl_init(void)
 {
 	GaimPlugin *plugin;
-	GaimSslOps *ops = gaim_ssl_get_ops();
-	gboolean success = FALSE;
+	GaimSslOps *ops;
 
 	if (_ssl_initialized)
 		return FALSE;
@@ -43,12 +42,11 @@
 	if (plugin != NULL && !gaim_plugin_is_loaded(plugin))
 		gaim_plugin_load(plugin);
 
+	ops = gaim_ssl_get_ops();
 	if (ops != NULL && ops->init != NULL)
-		success = ops->init();
-
-	_ssl_initialized = success;
-
-	return success;
+		return ops->init();
+	else
+		return FALSE;
 }
 
 gboolean