changeset 27075:c2c6ef44d66e

merge of '31f78d91abb7452e597bbd0f20f910c6cbb56099' and 'f017580a3b23ad3050f63c88789c0229df75a8ee'
author Paul Aurich <paul@darkrain42.org>
date Sun, 07 Jun 2009 18:46:23 +0000
parents 5bbdb0a93c52 (diff) 7b7d1fc8dbbf (current diff)
children abab554140b5 7dbe7ae559d3
files
diffstat 1 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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