pidgin: ae5a2cd1: jabber: Simplify; js is the callback dat...

[darkrain42 at pidgin.im]

-----------------------------------------------------------------
Revision: ae5a2cd1da029523f7d734738a879d06c2178a4b
Ancestor: de01d42f3514a8ad2b93d42133b935365653f16a
Author: darkrain42 at pidgin.im
Date: 2009-08-21T20:47:47
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/ae5a2cd1da029523f7d734738a879d06c2178a4b

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

ChangeLog: 

jabber: Simplify; js is the callback data and can't be NULL.

-------------- next part --------------
============================================================
--- libpurple/protocols/jabber/google.c	eb0c9e62c07275f327e30bfc69e7a217ca208be4
+++ libpurple/protocols/jabber/google.c	96b7fe9831a293b540f1fbc4362e9358f3e6274e
@@ -1335,18 +1335,16 @@ jabber_google_stun_lookup_cb(GSList *hos
 			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) {