Mercurial > pidgin3 / changeset

--- a/libpurple/protocols/bonjour/jabber.c	Tue Jul 02 02:12:08 2019 -0400
+++ b/libpurple/protocols/bonjour/jabber.c	Tue Jul 02 18:18:53 2019 -0400
@@ -330,7 +330,6 @@
 
 	/* If we're not ready to actually send, append it to the buffer */
 	if (bconv->tx_handler != 0
-			|| bconv->connect_data != NULL
 			|| bconv->sent_stream_start != FULLY_SENT
 			|| !bconv->recv_stream_start
 			|| purple_circular_buffer_get_max_read(bconv->tx_buf) > 0) {
@@ -1215,9 +1214,6 @@
 	bconv->output = NULL;
 
 	g_object_unref(G_OBJECT(bconv->tx_buf));
-	if (bconv->connect_data != NULL) {
-		purple_proxy_connect_cancel(bconv->connect_data);
-	}
 	if (bconv->stream_data != NULL) {
 		struct _stream_start_data *ss = bconv->stream_data;
 		g_free(ss->msg);
@@ -1257,7 +1253,6 @@
 			if (bb && bb->conversation) {
 				/* Any ongoing connection attempt is cancelled
 				 * when a connection is destroyed */
-				bb->conversation->connect_data = NULL;
 				bonjour_jabber_close_conversation(bb->conversation);
 				bb->conversation = NULL;
 			}

--- a/libpurple/protocols/bonjour/jabber.h	Tue Jul 02 02:12:08 2019 -0400
+++ b/libpurple/protocols/bonjour/jabber.h	Tue Jul 02 18:18:53 2019 -0400
@@ -53,7 +53,6 @@
 	PurpleCircularBuffer *tx_buf;
 	int sent_stream_start; /* 0 = Unsent, 1 = Partial, 2 = Complete */
 	gboolean recv_stream_start;
-	PurpleProxyConnectData *connect_data;
 	gpointer stream_data;
 	xmlParserCtxt *context;
 	PurpleXmlNode *current;