Mercurial > pidgin.yaz
changeset 23379:6c728443b426
We only allow one keepalive timeout, so simplify this.
| author | Daniel Atallah <daniel.atallah@gmail.com> |
|---|---|
| date | Wed, 18 Jun 2008 03:16:28 +0000 |
| parents | e12600d6b902 |
| children | 3f765f7e79d4 |
| files | libpurple/protocols/jabber/jabber.c |
| diffstat | 1 files changed, 3 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/protocols/jabber/jabber.c Wed Jun 18 03:14:47 2008 +0000 +++ b/libpurple/protocols/jabber/jabber.c Wed Jun 18 03:16:28 2008 +0000 @@ -375,9 +375,9 @@ g_free(txt); } -static void jabber_pong_cb(JabberStream *js, xmlnode *packet, gpointer timeout) +static void jabber_pong_cb(JabberStream *js, xmlnode *packet, gpointer unused) { - purple_timeout_remove(GPOINTER_TO_INT(timeout)); + purple_timeout_remove(js->keepalive_timeout); js->keepalive_timeout = -1; } @@ -401,7 +401,7 @@ xmlnode_set_namespace(ping, "urn:xmpp:ping"); js->keepalive_timeout = purple_timeout_add_seconds(120, (GSourceFunc)(jabber_pong_timeout), gc); - jabber_iq_set_callback(iq, jabber_pong_cb, GINT_TO_POINTER(js->keepalive_timeout)); + jabber_iq_set_callback(iq, jabber_pong_cb, NULL); jabber_iq_send(iq); } }