diff src/ssl-gnutls.c @ 6764:6d0d4e9149b9

[gaim-migrate @ 7296] well, jabber.org is being a pain in the moment, as is my server. but this seems to work, so here it is. Jabber SSL support. Make sure you set the port to 5223 and check the "Use SSL" checkbox in the account editor. committer: Tailor Script <[e-mail]>

--- a/src/ssl-gnutls.c	Sat Sep 06 15:15:24 2003 +0000
+++ b/src/ssl-gnutls.c	Sat Sep 06 16:04:41 2003 +0000
@@ -60,16 +60,6 @@
 }
 
 static void
-input_func(gpointer data, gint source, GaimInputCondition cond)
-{
-	GaimSslConnection *gsc = (GaimSslConnection *)data;
-
-	gaim_debug_misc("gnutls", "In input_func\n");
-
-	gsc->input_func(gsc->user_data, gsc, cond);
-}
-
-static void
 ssl_gnutls_connect_cb(gpointer data, gint source, GaimInputCondition cond)
 {
 	GaimSslConnection *gsc = (GaimSslConnection *)data;
@@ -103,14 +93,12 @@
 	{
 		gaim_debug_error("gnutls", "Handshake failed\n");
 
+		/* XXX: notify the guy expecting the callback somehow? */
 		gaim_ssl_close(gsc);
 	}
 	else
 	{
-		gaim_debug_info("gnutls", "Adding input handler.\n");
-		gsc->inpa = gaim_input_add(gsc->fd,
-								   GAIM_INPUT_READ | GAIM_INPUT_WRITE,
-								   input_func, gsc);
+		gsc->connect_cb(gsc->connect_cb_data, gsc, cond);
 	}
 }