pidgin: 9283c8f4: Myspace: Move "inpa" input watcher into ...

[andrew.victor at mxit.com]

----------------------------------------------------------------------
Revision: 9283c8f4097cabba74e3f5fb022cbac2b2f56b1d
Parent:   f7a653e938ca5b72f961885c81c3f1c0fdcc3115
Author:   andrew.victor at mxit.com
Date:     10/18/11 17:02:58
Branch:   im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/9283c8f4097cabba74e3f5fb022cbac2b2f56b1d

Changelog: 

Myspace: Move "inpa" input watcher into protocol_data.


Changes against parent f7a653e938ca5b72f961885c81c3f1c0fdcc3115

  patched  libpurple/protocols/myspace/myspace.c
  patched  libpurple/protocols/myspace/session.h

-------------- next part --------------
============================================================
--- libpurple/protocols/myspace/myspace.c	4a4b86fb10abe648db6c81a4e6a7afdbc7e7f9a5
+++ libpurple/protocols/myspace/myspace.c	77afca8df0fb8dc53ecc9dac0e6baaab870afa0d
@@ -2167,8 +2167,7 @@ msim_connect_cb(gpointer data, gint sour
 	}
 
 	session->fd = source;
-
-	gc->inpa = purple_input_add(source, PURPLE_INPUT_READ, msim_input_cb, gc);
+	session->inpa = purple_input_add(source, PURPLE_INPUT_READ, msim_input_cb, gc);
 }
 
 /**
@@ -2263,8 +2262,9 @@ msim_close(PurpleConnection *gc)
 
 	purple_connection_set_protocol_data(gc, NULL);
 
-	if (session->gc->inpa) {
-		purple_input_remove(session->gc->inpa);
+	if (session->inpa) {
+		purple_input_remove(session->inpa);
+		session->inpa = 0;
 	}
 	if (session->fd >= 0) {
 		close(session->fd);
============================================================
--- libpurple/protocols/myspace/session.h	b6fd056e7c512e5210fac889456be2e2e7b84d3a
+++ libpurple/protocols/myspace/session.h	26ef1d78d5e8f0242dd02b316fcaa6530155a95d
@@ -38,6 +38,7 @@ typedef struct _MsimSession
 	int privacy_mode;                   /**< This is a bitmask */
 	int offline_message_mode;
 	gint fd;                            /**< File descriptor to/from server */
+	guint inpa;							/**< The input watcher */
 
 	/* TODO: Remove. */
 	GHashTable *user_lookup_cb;         /**< Username -> userid lookup callback */