[Gaim-commits] CVS: gaim/plugins/ssl ssl-gnutls.c,1.3,1.4 ssl-nss.c,1.7,1.8

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

Update of /cvsroot/gaim/gaim/plugins/ssl
In directory sc8-pr-cvs1:/tmp/cvs-serv25771/plugins/ssl

Modified Files:
	ssl-gnutls.c ssl-nss.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: ssl-gnutls.c
===================================================================
RCS file: /cvsroot/gaim/gaim/plugins/ssl/ssl-gnutls.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -p -r1.3 -r1.4
--- ssl-gnutls.c	30 Sep 2003 02:42:18 -0000	1.3
+++ ssl-gnutls.c	15 Oct 2003 06:32:13 -0000	1.4
@@ -94,7 +94,9 @@ ssl_gnutls_connect_cb(gpointer data, gin
 	{
 		gaim_debug_error("gnutls", "Handshake failed\n");
 
-		/* XXX: notify the guy expecting the callback somehow? */
+		if (gsc->error_cb != NULL)
+			gsc->error_cb(gsc, GAIM_SSL_HANDSHAKE_FAILED, data);
+
 		gaim_ssl_close(gsc);
 	}
 	else

Index: ssl-nss.c
===================================================================
RCS file: /cvsroot/gaim/gaim/plugins/ssl/ssl-nss.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -p -r1.7 -r1.8
--- ssl-nss.c	5 Oct 2003 05:35:43 -0000	1.7
+++ ssl-nss.c	15 Oct 2003 06:32:13 -0000	1.8
@@ -204,6 +204,9 @@ ssl_nss_connect_cb(gpointer data, gint s
 	{
 		gaim_debug_error("nss", "Handshake failed\n");
 
+		if (gsc->error_cb != NULL)
+			gsc->error_cb(gsc, GAIM_SSL_HANDSHAKE_FAILED, data);
+
 		gaim_ssl_close(gsc);
 
 		return;