# HG changeset patch
# User Mike Ruprecht <maiku@soc.pidgin.im>
# Date 1229158138 0
# Node ID 93cc8982d4e5a188e946041e3fe2f89d0cdb1b0e
# Parent  1ce297c8923b0a239f44b48c24317b28cae8ad9e# Parent  cb4337d6c803852615a91539357c7055f5bbfc07
explicit merge of '094ca19cc431d185c7b94947bfcd7cfc2d2f4a0b'
              and 'a92ecd05b30230b85149a7c4edbcb269bc1c4841'

diff -r 1ce297c8923b -r 93cc8982d4e5 libpurple/media.c
--- a/libpurple/media.c	Sat Dec 13 08:37:57 2008 +0000
+++ b/libpurple/media.c	Sat Dec 13 08:48:58 2008 +0000
@@ -1194,7 +1194,7 @@
 		gchar *stun_ip = NULL;
 		FsStream *fsstream = NULL;
 
-		if (stun_ip = purple_media_get_stun_pref_ip()) {
+		if ((stun_ip = purple_media_get_stun_pref_ip())) {
 			GParameter *param = g_new0(GParameter, num_params+1);
 			memcpy(param, params, sizeof(GParameter) * num_params);