[Gaim-commits] CVS: gaim/src/protocols/msn notification.c,1.70,1.71

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

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

Modified Files:
	notification.c 
Log Message:
Added a parameter to gaim_ssl_connect() to specify an optional error
callback. MSN takes advantage of it, but since I can't reproduce the errors
here, I'm not positive it works. It should though! Famous last words.


Index: notification.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/msn/notification.c,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -d -p -r1.70 -r1.71
--- notification.c	8 Oct 2003 23:27:22 -0000	1.70
+++ notification.c	15 Oct 2003 06:32:13 -0000	1.71
@@ -313,6 +313,16 @@ inf_cmd(MsnServConn *servconn, const cha
 }
 
 static void
+login_error_cb(GaimSslConnection *gsc, GaimSslErrorType error, void *data)
+{
+	MsnServConn *servconn = (MsnServConn *)data;
+	GaimAccount *account = servconn->session->account;
+	GaimConnection *gc = gaim_account_get_connection(account);
+
+	gaim_connection_error(gc, _("Unable to connect to server"));
+}
+
+static void
 login_connect_cb(gpointer data, GaimSslConnection *gsc,
 				 GaimInputCondition cond)
 {
@@ -420,7 +430,8 @@ login_connect_cb(gpointer data, GaimSslC
 		session->ssl_conn = gaim_ssl_connect(session->account,
 											 session->ssl_login_host,
 											 GAIM_SSL_DEFAULT_PORT,
-											 login_connect_cb, servconn);
+											 login_connect_cb, login_error_cb,
+											 servconn);
 	}
 	else if (strstr(buffer, "HTTP/1.1 401 Unauthorized") != NULL)
 	{
@@ -590,7 +601,8 @@ nexus_connect_cb(gpointer data, GaimSslC
 	session->ssl_conn = gaim_ssl_connect(session->account,
 										 session->ssl_login_host,
 										 GAIM_SSL_DEFAULT_PORT,
-										 login_connect_cb, servconn);
+										 login_connect_cb, login_error_cb,
+										 servconn);
 }
 
 static gboolean
@@ -682,7 +694,8 @@ usr_cmd(MsnServConn *servconn, const cha
 		session->ssl_conn = gaim_ssl_connect(session->account,
 											 "nexus.passport.com",
 											 GAIM_SSL_DEFAULT_PORT,
-											 nexus_connect_cb, servconn);
+											 nexus_connect_cb, login_error_cb,
+											 servconn);
 
 		if (session->ssl_conn == NULL)
 		{