merge of 'd584e1732e45d98d1a94bb50ccf136df0905d1b3'

Sun, 07 Jun 2009 18:46:23 +0000

author
Paul Aurich <darkrain42@pidgin.im>
date
Sun, 07 Jun 2009 18:46:23 +0000
changeset 27309
9f3780185c28
parent 27308
d584e1732e45 (diff)
parent 27307
65906c6de115 (current diff)
child 27310
fd59f3923233
child 27312
07a772783c0f

merge of 'd584e1732e45d98d1a94bb50ccf136df0905d1b3'
and '65906c6de11503b6ac1a9a84ea0a73df628bd902'

--- 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

mercurial