changeset 27193:916f266aca98

merge of '1356d70e521b4cb5ab8ea10f0927063b5c62394a' and '6e02b385a7decbbfdad9bc91c80b0bc86fbd8129'
author Paul Aurich <paul@darkrain42.org>
date Sat, 27 Jun 2009 17:50:49 +0000
parents cb3e89f5a2d5 (diff) 291724375feb (current diff)
children 7f43d6779764
files
diffstat 1 files changed, 1 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/libpurple/protocols/jabber/ping.c	Sat Jun 27 17:46:49 2009 +0000
+++ b/libpurple/protocols/jabber/ping.c	Sat Jun 27 17:50:49 2009 +0000
@@ -33,11 +33,9 @@
                                      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