[Gaim-commits] CVS: gaim/src/protocols/msn msn.c,1.237,1.238

[Christian H. <ch...@us...>]

Update of /cvsroot/gaim/gaim/src/protocols/msn
In directory sc8-pr-cvs1:/tmp/cvs-serv29421/src/protocols/msn

Modified Files:
	msn.c 
Log Message:
If SSL is not enabled, MSN will load, but error on connect.


Index: msn.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/msn/msn.c,v
retrieving revision 1.237
retrieving revision 1.238
diff -u -d -p -r1.237 -r1.238
--- msn.c	14 Oct 2003 16:44:36 -0000	1.237
+++ msn.c	16 Oct 2003 00:53:02 -0000	1.238
@@ -448,11 +448,19 @@ msn_login(GaimAccount *account)
 	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;
 
@@ -1606,8 +1614,6 @@ static void
 init_plugin(GaimPlugin *plugin)
 {
 	GaimAccountOption *option;
-
-	info.dependencies = g_list_append(info.dependencies, "core-ssl");
 
 	option = gaim_account_option_string_new(_("Login server"), "server",
 											MSN_SERVER);