Mercurial > pidgin3 / changeset

--- a/libpurple/protocols/novell/nmconn.c	Sat Nov 02 16:40:40 2019 -0400
+++ b/libpurple/protocols/novell/nmconn.c	Sat Nov 02 21:43:23 2019 -0400
@@ -183,8 +183,6 @@
 	if (conn) {
 		g_slist_free_full(conn->requests, (GDestroyNotify)nm_release_request);
 		conn->requests = NULL;
-		g_free(conn->ssl_conn);
-		conn->ssl_conn = NULL;
 		g_free(conn->addr);
 		conn->addr = NULL;
 		g_free(conn);
@@ -197,7 +195,7 @@
 	if (conn == NULL || buff == NULL)
 		return -1;
 
-	return conn->ssl_conn->write(conn->ssl_conn->data, buff, len);
+	return conn->write(conn->data, buff, len);
 }
 
 int
@@ -206,7 +204,7 @@
 	if (conn == NULL || buff == NULL)
 		return -1;
 
-	return conn->ssl_conn->read(conn->ssl_conn->data, buff, len);
+	return conn->read(conn->data, buff, len);
 }
 
 NMERR_T

--- a/libpurple/protocols/novell/nmconn.h	Sat Nov 02 16:40:40 2019 -0400
+++ b/libpurple/protocols/novell/nmconn.h	Sat Nov 02 21:43:23 2019 -0400
@@ -22,7 +22,6 @@
 #define PURPLE_NOVELL_NMCONN_H
 
 typedef struct _NMConn NMConn;
-typedef struct _NMSSLConn NMSSLConn;
 
 #include "nmfield.h"
 #include "nmuser.h"
@@ -45,21 +44,12 @@
 	/* A list of requests currently awaiting a response. */
 	GSList *requests;
 
-	/* SSL connection  */
-	NMSSLConn *ssl_conn;
-
-};
-
-struct _NMSSLConn
-{
-
 	/*  Data to pass to the callbacks */
 	gpointer data;
 
 	/* Callbacks for reading/writing */
 	nm_ssl_read_cb read;
 	nm_ssl_write_cb write;
-
 };
 
 /**

--- a/libpurple/protocols/novell/novell.c	Sat Nov 02 16:40:40 2019 -0400
+++ b/libpurple/protocols/novell/novell.c	Sat Nov 02 21:43:23 2019 -0400
@@ -1680,7 +1680,7 @@
 
 	gc = data;
 	user = purple_connection_get_protocol_data(gc);
-	user->conn->ssl_conn->data = NULL;
+	user->conn->data = NULL;
 
 	purple_connection_ssl_error (gc, error);
 }
@@ -2204,14 +2204,13 @@
 		purple_connection_update_progress(gc, _("Connecting"),
 										1, NOVELL_CONNECT_STEPS);
 
-		user->conn->ssl_conn = g_new0(NMSSLConn, 1);
-		user->conn->ssl_conn->read = (nm_ssl_read_cb) purple_ssl_read;
-		user->conn->ssl_conn->write = (nm_ssl_write_cb) purple_ssl_write;
-
-		user->conn->ssl_conn->data = purple_ssl_connect(user->client_data,
-													  user->conn->addr, user->conn->port,
-													  novell_ssl_connected_cb, novell_ssl_connect_error, gc);
-		if (user->conn->ssl_conn->data == NULL) {
+		user->conn->read = (nm_ssl_read_cb)purple_ssl_read;
+		user->conn->write = (nm_ssl_write_cb)purple_ssl_write;
+
+		user->conn->data = purple_ssl_connect(
+		        user->client_data, user->conn->addr, user->conn->port,
+		        novell_ssl_connected_cb, novell_ssl_connect_error, gc);
+		if (user->conn->data == NULL) {
 			purple_connection_error(gc,
 				PURPLE_CONNECTION_ERROR_NO_SSL_SUPPORT,
 				_("SSL support unavailable"));
@@ -2231,8 +2230,8 @@
 	user = purple_connection_get_protocol_data(gc);
 	if (user) {
 		conn = user->conn;
-		if (conn && conn->ssl_conn) {
-			purple_ssl_close(user->conn->ssl_conn->data);
+		if (conn) {
+			purple_ssl_close(user->conn->data);
 		}
 		nm_deinitialize_user(user);
 	}