Mercurial > pidgin3 / changeset

--- a/libpurple/connection.c	Sat Jul 13 21:46:46 2013 +0530
+++ b/libpurple/connection.c	Sat Jul 13 21:56:14 2013 +0530
@@ -79,7 +79,8 @@
 	 */
 	gboolean wants_to_die;
 
-	guint disconnect_timeout;  /**< Timer used for nasty stack tricks         */
+	guint disconnect_timeout;  /**< Timer used for nasty stack tricks
+	                                TODO Get rid of this.                     */
 	time_t last_received;      /**< When we last received a packet. Set by the
 	                                prpl to avoid sending unneeded keepalives */
 };

--- a/libpurple/protocols/jabber/parser.c	Sat Jul 13 21:46:46 2013 +0530
+++ b/libpurple/protocols/jabber/parser.c	Sat Jul 13 21:56:14 2013 +0530
@@ -308,6 +308,10 @@
 	}
 
 	if (js->protocol_version.major == 0 && js->protocol_version.minor == 9 &&
+#warning Is this (gc->disconnect_timeout) required here? If so, an alternative is needed.
+#if 0
+			!js->gc->disconnect_timeout &&
+#endif
 			(js->state == JABBER_STREAM_INITIALIZING ||
 			 js->state == JABBER_STREAM_INITIALIZING_ENCRYPTION)) {
 		/*