# HG changeset patch
# User Paul Aurich <paul@darkrain42.org>
# Date 1244400383 0
# Node ID c2c6ef44d66e44b64b7e9437bb523f2be0c9e8de
# Parent  5bbdb0a93c528e944612c3cb006af6c84c1dae91# Parent  7b7d1fc8dbbfa2283083d8590bfd1f3bfa82ba62
merge of '31f78d91abb7452e597bbd0f20f910c6cbb56099'
     and 'f017580a3b23ad3050f63c88789c0229df75a8ee'

diff -r 7b7d1fc8dbbf -r c2c6ef44d66e libpurple/protocols/jabber/ping.c
--- a/libpurple/protocols/jabber/ping.c	Sun Jun 07 17:42:00 2009 +0000
+++ b/libpurple/protocols/jabber/ping.c	Sun Jun 07 18:46:23 2009 +0000
@@ -33,9 +33,11 @@
                                      xmlnode *packet, gpointer data)
 {
 	if (js->keepalive_timeout != 0) {
+		purple_debug_misc("jabber", "Keepalive PONG\n");
 		purple_timeout_remove(js->keepalive_timeout);
 		js->keepalive_timeout = 0;
-	}
+	} else
+		purple_debug_warning("jabber", "Keepalive PONG with no outstanding timeout!\n");
 }
 
 void