/soc/2013/ankitkv/gobjectification: 5c0fcb671ecd: Backed out cha...

[Ankit Vani]

Changeset: 5c0fcb671ecd0766bb243f9492e663478cf1d36f
Author:	 Ankit Vani <a at nevitus.org>
Date:	 2013-07-13 21:56 +0530
Branch:	 soc.2013.gobjectification
URL: https://hg.pidgin.im/soc/2013/ankitkv/gobjectification/rev/5c0fcb671ecd

Description:

Backed out changeset eb42f0726a08

diffstat:

 libpurple/connection.c              |  3 ++-
 libpurple/protocols/jabber/parser.c |  4 ++++
 2 files changed, 6 insertions(+), 1 deletions(-)

diffs (27 lines):

diff --git a/libpurple/connection.c b/libpurple/connection.c
--- a/libpurple/connection.c
+++ b/libpurple/connection.c
@@ -79,7 +79,8 @@ struct _PurpleConnectionPrivate
 	 */
 	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 */
 };
diff --git a/libpurple/protocols/jabber/parser.c b/libpurple/protocols/jabber/parser.c
--- a/libpurple/protocols/jabber/parser.c
+++ b/libpurple/protocols/jabber/parser.c
@@ -308,6 +308,10 @@ void jabber_parser_process(JabberStream 
 	}
 
 	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)) {
 		/*