# HG changeset patch
# User andrew.victor@mxit.com
# Date 1318971519 0
# Node ID d8c652ea476a1b79ea8a342bddf18d25af579058
# Parent  50cd80d3554e6c3d32c10650b65c599abb2db48b
MXit: Move "inpa" input watcher from PurpleConnection into PurpleConnection->proto_data.

diff -r 50cd80d3554e -r d8c652ea476a libpurple/protocols/mxit/login.c
--- a/libpurple/protocols/mxit/login.c	Tue Oct 18 20:25:41 2011 +0000
+++ b/libpurple/protocols/mxit/login.c	Tue Oct 18 20:58:39 2011 +0000
@@ -176,7 +176,7 @@
 	session->fd = source;
 
 	/* start listening on the open connection for messages from the server (reference: "libpurple/eventloop.h") */
-	session->con->inpa = purple_input_add( session->fd, PURPLE_INPUT_READ, mxit_cb_rx, session );
+	session->inpa = purple_input_add( session->fd, PURPLE_INPUT_READ, mxit_cb_rx, session );
 
 	mxit_connected( session );
 }
@@ -780,9 +780,9 @@
 	purple_debug_info( MXIT_PLUGIN_ID, "mxit_reconnect\n" );
 
 	/* remove the input cb function */
-	if ( session->con->inpa ) {
-		purple_input_remove( session->con->inpa );
-		session->con->inpa = 0;
+	if ( session->inpa ) {
+		purple_input_remove( session->inpa );
+		session->inpa = 0;
 	}
 
 	/* close existing connection */
diff -r 50cd80d3554e -r d8c652ea476a libpurple/protocols/mxit/mxit.h
--- a/libpurple/protocols/mxit/mxit.h	Tue Oct 18 20:25:41 2011 +0000
+++ b/libpurple/protocols/mxit/mxit.h	Tue Oct 18 20:58:39 2011 +0000
@@ -161,6 +161,7 @@
 	/* libpurple */
 	PurpleAccount*		acc;						/* pointer to the libpurple internal account struct */
 	PurpleConnection*	con;						/* pointer to the libpurple internal connection struct */
+	guint				inpa;						/* the input watcher */
 
 	/* transmit */
 	struct tx_queue		queue;						/* transmit packet queue (FIFO mode) */
diff -r 50cd80d3554e -r d8c652ea476a libpurple/protocols/mxit/protocol.c
--- a/libpurple/protocols/mxit/protocol.c	Tue Oct 18 20:25:41 2011 +0000
+++ b/libpurple/protocols/mxit/protocol.c	Tue Oct 18 20:58:39 2011 +0000
@@ -2819,9 +2819,9 @@
 	}
 
 	/* remove the input cb function */
-	if ( session->con->inpa ) {
-		purple_input_remove( session->con->inpa );
-		session->con->inpa = 0;
+	if ( session->inpa ) {
+		purple_input_remove( session->inpa );
+		session->inpa = 0;
 	}
 
 	/* remove HTTP poll timer */