- Move ssl-gnutls x509 registration until after GnuTLS itself is inited

  to guarantee that it is ready to use when registered

1 files changed, 4 insertions, 4 deletions

diff --git a/libpurple/plugins/ssl/ssl-gnutls.c b/libpurple/plugins/ssl/ssl-gnutls.c
index eda92a646f..32be133d0f 100644
--- a/libpurple/plugins/ssl/ssl-gnutls.c
+++ b/libpurple/plugins/ssl/ssl-gnutls.c
@@ -925,10 +925,6 @@ static gboolean
 plugin_load(PurplePlugin *plugin)
 {
 #ifdef HAVE_GNUTLS
-	/* Register that we're providing an X.509 CertScheme */
-	/* @TODO : error checking */
-	purple_certificate_register_scheme( &x509_gnutls );
-	
 	if(!purple_ssl_get_ops()) {
 		purple_ssl_set_ops(&ssl_ops);
 	}
@@ -936,6 +932,10 @@ plugin_load(PurplePlugin *plugin)
 	/* Init GNUTLS now so others can use it even if sslconn never does */
 	ssl_gnutls_init_gnutls();
 
+	/* Register that we're providing an X.509 CertScheme */
+	/* @TODO : error checking */
+	purple_certificate_register_scheme( &x509_gnutls );
+
 	return TRUE;
 #else
 	return FALSE;