/soc/2013/ankitkv/gobjectification: ceb47557895a: Added PURPLE_P...

[Ankit Vani]

Changeset: ceb47557895a28b5eacf811629414594f665e526
Author:	 Ankit Vani <a at nevitus.org>
Date:	 2013-09-22 19:43 +0530
Branch:	 soc.2013.gobjectification.plugins
URL: https://hg.pidgin.im/soc/2013/ankitkv/gobjectification/rev/ceb47557895a

Description:

Added PURPLE_PLUGIN_INFO_FLAGS_AUTO_LOAD flag to core-ssl plugin

diffstat:

 libpurple/plugins/ssl/ssl.c |  3 ++-
 libpurple/sslconn.c         |  2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diffs (25 lines):

diff --git a/libpurple/plugins/ssl/ssl.c b/libpurple/plugins/ssl/ssl.c
--- a/libpurple/plugins/ssl/ssl.c
+++ b/libpurple/plugins/ssl/ssl.c
@@ -90,7 +90,8 @@ plugin_query(GError **error)
 		"authors",      authors,
 		"website",      PURPLE_WEBSITE,
 		"abi-version",  PURPLE_ABI_VERSION,
-		"flags",        PURPLE_PLUGIN_INFO_FLAGS_INTERNAL,
+		"flags",        PURPLE_PLUGIN_INFO_FLAGS_INTERNAL |
+		                PURPLE_PLUGIN_INFO_FLAGS_AUTO_LOAD,
 		NULL
 	);
 }
diff --git a/libpurple/sslconn.c b/libpurple/sslconn.c
--- a/libpurple/sslconn.c
+++ b/libpurple/sslconn.c
@@ -47,7 +47,7 @@ ssl_init(void)
 
 	plugin = purple_plugins_find_plugin("core-ssl");
 
-	if (plugin != NULL)
+	if (plugin && !purple_plugin_is_loaded(plugin))
 		purple_plugin_load(plugin, NULL);
 
 	ops = purple_ssl_get_ops();