Mercurial > pidgin.yaz
diff libpurple/protocols/oscar/peer.c @ 25016:ff5e2356683f
propagate from branch 'im.pidgin.pidgin' (head 07f8d9c59020c1f69cc21b71f8252f13efd6a6e0)
to branch 'im.pidgin.cpw.darkrain42.oscar-ssl' (head 8a336a3d256ee3435232fad10bd222d3bab817ac)
| author | Paul Aurich <paul@darkrain42.org> |
|---|---|
| date | Wed, 14 Jan 2009 06:29:47 +0000 |
| parents | 568b786c36f9 ea70a446dde4 |
| children | 8c8948b9f602 7f552614ec8a |
line wrap: on
line diff
--- a/libpurple/protocols/oscar/peer.c Wed Jan 14 02:50:54 2009 +0000 +++ b/libpurple/protocols/oscar/peer.c Wed Jan 14 06:29:47 2009 +0000 @@ -690,7 +690,10 @@ return; } - listener_ip = purple_network_get_my_ip(bos_conn->fd); + if (bos_conn->gsc) + listener_ip = purple_network_get_my_ip(bos_conn->gsc->fd); + else + listener_ip = purple_network_get_my_ip(bos_conn->fd); listener_port = purple_network_get_port_from_fd(conn->listenerfd); if (conn->type == OSCAR_CAPABILITY_DIRECTIM) {