# HG changeset patch
# User Evan Schoenberg <evan.s@dreskin.net>
# Date 1174969313 0
# Node ID 65b5b2b9b5bc25a360a9f16952dbbe304b536bd0
# Parent  9214184b9d10d1afc6e323b7d05711cb4fc6a0cb# Parent  b4ab4812838a69d5b3f939153ba11d7d393f47e1
merge of '7172b457b2254aea4fdb335f5cb8b43dcbb127f5'
     and '8977225fd5865020bc47afb7012cf60d2b21e6ae'

diff -r 9214184b9d10 -r 65b5b2b9b5bc libpurple/network.c
--- a/libpurple/network.c	Tue Mar 27 03:51:42 2007 +0000
+++ b/libpurple/network.c	Tue Mar 27 04:21:53 2007 +0000
@@ -364,7 +364,7 @@
 #ifdef ENABLE_NAT_PMP
 	/* Attempt a NAT-PMP Mapping, which will return immediately */
 	if (purple_pmp_create_map(((socket_type == SOCK_STREAM) ? PURPLE_PMP_TYPE_TCP : PURPLE_PMP_TYPE_UDP),
-							  actual_port, actual_port, PURPLE_PMP_LIFETIME) != NULL)
+							  actual_port, actual_port, PURPLE_PMP_LIFETIME))
 	{
 		purple_debug_info("network", "Created NAT-PMP mapping on port %i",actual_port);
 		/* We want to return listen_data now, and on the next run loop trigger the cb and destroy listen_data */