Mercurial > pidgin.yaz
comparison libpurple/protocols/jabber/ping.c @ 27577:6d26258e9f1d
propagate from branch 'im.pidgin.pidgin' (head ac87c285c7056f86005dc157b9870745de471f74)
to branch 'im.pidgin.cpw.darkrain42.roster' (head 976d874853ac9745edb77d3cf107b92ebc037c10)
author | Paul Aurich <paul@darkrain42.org> |
---|---|
date | Mon, 06 Jul 2009 04:37:41 +0000 |
parents | cb3e89f5a2d5 |
children | 8c991e09efcb |
comparison
equal
deleted
inserted
replaced
27576:b9da56683499 | 27577:6d26258e9f1d |
---|---|
30 | 30 |
31 static void jabber_keepalive_pong_cb(JabberStream *js, const char *from, | 31 static void jabber_keepalive_pong_cb(JabberStream *js, const char *from, |
32 JabberIqType type, const char *id, | 32 JabberIqType type, const char *id, |
33 xmlnode *packet, gpointer data) | 33 xmlnode *packet, gpointer data) |
34 { | 34 { |
35 if (js->keepalive_timeout >= 0) { | 35 if (js->keepalive_timeout != 0) { |
36 purple_timeout_remove(js->keepalive_timeout); | 36 purple_timeout_remove(js->keepalive_timeout); |
37 js->keepalive_timeout = -1; | 37 js->keepalive_timeout = 0; |
38 } | 38 } |
39 } | 39 } |
40 | 40 |
41 void | 41 void |
42 jabber_ping_parse(JabberStream *js, const char *from, | 42 jabber_ping_parse(JabberStream *js, const char *from, |