# HG changeset patch
# User Paul Aurich <paul@darkrain42.org>
# Date 1250887667 0
# Node ID ed30bc20442cb46bfca33290b76dfad7388d79c1
# Parent  76c0969e3ea7e01c5083b9b4485ae4617fb7bab2
jabber: Simplify; js is the callback data and can't be NULL.

diff -r 76c0969e3ea7 -r ed30bc20442c libpurple/protocols/jabber/google.c
--- a/libpurple/protocols/jabber/google.c	Fri Aug 21 20:45:47 2009 +0000
+++ b/libpurple/protocols/jabber/google.c	Fri Aug 21 20:47:47 2009 +0000
@@ -1335,18 +1335,16 @@
 			port = ntohs(((struct sockaddr_in *) addr)->sin_port);
 		}
 
-		if (js) {
-			if (js->stun_ip) {
-				g_free(js->stun_ip);
-			}
-			js->stun_ip = g_strdup(dst);
-			purple_debug_info("jabber", "set Google STUN IP address: %s\n", dst);
-			js->stun_port = port;
-			purple_debug_info("jabber", "set Google STUN port: %d\n", port);
-			purple_debug_info("jabber", "set Google STUN port: %d\n", port);
-			/* unmark ongoing query */
-			js->stun_query = NULL;
-		}
+		if (js->stun_ip)
+			g_free(js->stun_ip);
+		js->stun_ip = g_strdup(dst);
+		js->stun_port = port;
+
+		purple_debug_info("jabber", "set Google STUN IP/port address: "
+		                  "%s:%d\n", dst, port);
+
+		/* unmark ongoing query */
+		js->stun_query = NULL;
 	}
 
 	while (hosts != NULL) {