# HG changeset patch
# User Christian Hammond <chipx86@chipx86.com>
# Date 1066265582 0
# Node ID 2972dad4438b07914c998d20643f966e9a4e28ba
# Parent  29c0fe160f907fd825d3e40ff8dfd94d1af70811
[gaim-migrate @ 7856]
If SSL is not enabled, MSN will load, but error on connect.

committer: Tailor Script <tailor@pidgin.im>

diff -r 29c0fe160f90 -r 2972dad4438b ChangeLog
--- a/ChangeLog	Wed Oct 15 22:50:58 2003 +0000
+++ b/ChangeLog	Thu Oct 16 00:53:02 2003 +0000
@@ -3,6 +3,7 @@
 version 0.72
 	* Fixed a crash in the Add Chat dialog when selecting an
 	  account that doesn't support chats. Closes bug #821606.
+	* If SSL is not enabled, MSN will load, but error on connect.
 	* Swedish translation updated (Tore Lundqvist (luntor))
 
 version 0.71 (10/09/2003):
diff -r 29c0fe160f90 -r 2972dad4438b src/protocols/msn/msn.c
--- a/src/protocols/msn/msn.c	Wed Oct 15 22:50:58 2003 +0000
+++ b/src/protocols/msn/msn.c	Thu Oct 16 00:53:02 2003 +0000
@@ -448,11 +448,19 @@
 	const char *server;
 	int port;
 
+	gc = gaim_account_get_connection(account);
+
+	if (!gaim_ssl_is_supported())
+	{
+		gaim_connection_error(gc,
+			_("SSL support is needed for MSN. Please install it."));
+
+		return;
+	}
+
 	server = gaim_account_get_string(account, "server", MSN_SERVER);
 	port   = gaim_account_get_int(account,    "port",   MSN_PORT);
 
-	gc = gaim_account_get_connection(account);
-
 	session = msn_session_new(account, server, port);
 	session->prpl = my_protocol;
 
@@ -1607,8 +1615,6 @@
 {
 	GaimAccountOption *option;
 
-	info.dependencies = g_list_append(info.dependencies, "core-ssl");
-
 	option = gaim_account_option_string_new(_("Login server"), "server",
 											MSN_SERVER);
 	prpl_info.protocol_options = g_list_append(prpl_info.protocol_options,