Mercurial > pidgin
changeset 24974:93cc8982d4e5
explicit merge of '094ca19cc431d185c7b94947bfcd7cfc2d2f4a0b'
and 'a92ecd05b30230b85149a7c4edbcb269bc1c4841'
| author | Mike Ruprecht <maiku@soc.pidgin.im> |
|---|---|
| date | Sat, 13 Dec 2008 08:48:58 +0000 |
| parents | 1ce297c8923b (current diff) cb4337d6c803 (diff) |
| children | d03cfec8bf7f |
| files | libpurple/media.c pidgin/pidginstock-artwork.c |
| diffstat | 1 files changed, 1 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- 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);