# HG changeset patch
# User Elliott Sales de Andrade <qulogic@pidgin.im>
# Date 1282459230 0
# Node ID aa7c39c39af590e094dd944a98912074a96b5e9b
# Parent  8490c8eb4aa8d3261322604b5be49e5b59ffac8d
Optimize just a teensy-tiny bit.

diff -r 8490c8eb4aa8 -r aa7c39c39af5 libpurple/stun.c
--- a/libpurple/stun.c	Sun Aug 22 06:17:07 2010 +0000
+++ b/libpurple/stun.c	Sun Aug 22 06:40:30 2010 +0000
@@ -105,11 +105,11 @@
 }
 
 static void do_callbacks(void) {
-	while(callbacks) {
+	while (callbacks) {
 		StunCallback cb = callbacks->data;
-		if(cb)
+		if (cb)
 			cb(&nattype);
-		callbacks = g_slist_remove(callbacks, cb);
+		callbacks = g_slist_delete_link(callbacks, callbacks);
 	}
 }
 
@@ -280,7 +280,6 @@
 	GSList *hosts = data;
 	struct stun_conn *sc;
 	static struct stun_header hdr_data;
-	int ret;
 
 	if(fd < 0) {
 		nattype.status = PURPLE_STUN_STATUS_UNKNOWN;
@@ -298,15 +297,14 @@
 
 	sc->incb = purple_input_add(fd, PURPLE_INPUT_READ, reply_cb, sc);
 
-	ret = GPOINTER_TO_INT(hosts->data);
-	hosts = g_slist_remove(hosts, hosts->data);
+	hosts = g_slist_delete_link(hosts, hosts);
 	memcpy(&(sc->addr), hosts->data, sizeof(struct sockaddr_in));
 	g_free(hosts->data);
-	hosts = g_slist_remove(hosts, hosts->data);
-	while(hosts) {
-		hosts = g_slist_remove(hosts, hosts->data);
+	hosts = g_slist_delete_link(hosts, hosts);
+	while (hosts) {
+		hosts = g_slist_delete_link(hosts, hosts);
 		g_free(hosts->data);
-		hosts = g_slist_remove(hosts, hosts->data);
+		hosts = g_slist_delete_link(hosts, hosts);
 	}
 
 	hdr_data.type = htons(MSGTYPE_BINDINGREQUEST);
@@ -341,10 +339,10 @@
 	}
 
 	if (!purple_network_listen_range(12108, 12208, SOCK_DGRAM, hbn_listen_cb, hosts)) {
-		while(hosts) {
-			hosts = g_slist_remove(hosts, hosts->data);
+		while (hosts) {
+			hosts = g_slist_delete_link(hosts, hosts);
 			g_free(hosts->data);
-			hosts = g_slist_remove(hosts, hosts->data);
+			hosts = g_slist_delete_link(hosts, hosts);
 		}
 
 		nattype.status = PURPLE_STUN_STATUS_UNKNOWN;