pidgin: 8538a2f8: We only allow one keepalive timeout, so ...

[datallah at pidgin.im]

-----------------------------------------------------------------
Revision: 8538a2f807d6d671d1896aa0ad6be0d3a07c4035
Ancestor: 9e8a5e8d1ce90a9920d2d3f68e0ad2854134b4b5
Author: datallah at pidgin.im
Date: 2008-06-18T03:16:28
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/8538a2f807d6d671d1896aa0ad6be0d3a07c4035

Modified files:
        libpurple/protocols/jabber/jabber.c

ChangeLog: 

We only allow one keepalive timeout, so simplify this.

-------------- next part --------------
============================================================
--- libpurple/protocols/jabber/jabber.c	1e6cb816fea7d89f9135b1a8feb5b737d8dbc5b2
+++ libpurple/protocols/jabber/jabber.c	e98b3c84ef06f15c947b3190304799abef8f30b3
@@ -375,9 +375,9 @@ void jabber_send(JabberStream *js, xmlno
 	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 @@ void jabber_keepalive(PurpleConnection *
 		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);
 	}
 }