Mercurial > pidgin3 / changeset

--- a/ChangeLog	Sat Mar 08 01:07:04 2008 +0000
+++ b/ChangeLog	Sat Mar 08 17:17:57 2008 +0000
@@ -14,6 +14,8 @@
 	* Fix incorrectly marking some Yahoo! contacts as blocked
 	* Improved handling of UTF-8 group names on ICQ (beret)
 	* Fix a crash when starting if you have a Zephyr account
+	* Increase XMPP ping timeout to 120 seconds, to prevent poor network
+	  connections from timing out unnecessarily.
 
 	Pidgin:
 	* Remove a workaround for older versions gstreamer that was causing

--- a/libpurple/protocols/jabber/jabber.c	Sat Mar 08 01:07:04 2008 +0000
+++ b/libpurple/protocols/jabber/jabber.c	Sat Mar 08 17:17:57 2008 +0000
@@ -411,7 +411,7 @@
 	xmlnode *ping = xmlnode_new_child(iq->node, "ping");
 	xmlnode_set_namespace(ping, "urn:xmpp:ping");
 
-	js->keepalive_timeout = purple_timeout_add_seconds(20, (GSourceFunc)(jabber_pong_timeout), gc);
+	js->keepalive_timeout = purple_timeout_add_seconds(120, (GSourceFunc)(jabber_pong_timeout), gc);
 	jabber_iq_set_callback(iq, jabber_pong_cb, GINT_TO_POINTER(js->keepalive_timeout));
 	jabber_iq_send(iq);
 }