comparison: libpurple/protocols/jabber/disco.c
libpurple/protocols/jabber/disco.c
- changeset 29247
- ca703c2df180
- parent 29103
- aefa3f414775
- child 29814
- ad92005bcdcf
equal
deleted
inserted
replaced
| 29245:4b650ff83b2d | 29247:ca703c2df180 |
|---|---|
| 20 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA | 20 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA |
| 21 * | 21 * |
| 22 */ | 22 */ |
| 23 | 23 |
| 24 #include "internal.h" | 24 #include "internal.h" |
| 25 #include "network.h" | |
| 25 #include "prefs.h" | 26 #include "prefs.h" |
| 26 #include "debug.h" | 27 #include "debug.h" |
| 27 #include "request.h" | 28 #include "request.h" |
| 28 | 29 |
| 29 #include "adhoccommands.h" | 30 #include "adhoccommands.h" |
| 532 if (!strcmp(name, "Google Talk")) { | 533 if (!strcmp(name, "Google Talk")) { |
| 533 purple_debug_info("jabber", "Google Talk!\n"); | 534 purple_debug_info("jabber", "Google Talk!\n"); |
| 534 js->googletalk = TRUE; | 535 js->googletalk = TRUE; |
| 535 | 536 |
| 536 /* autodiscover stun and relays */ | 537 /* autodiscover stun and relays */ |
| 537 jabber_google_send_jingle_info(js); | 538 if (purple_network_get_stun_ip() == NULL || |
| 538 } else { | 539 purple_strequal(purple_network_get_stun_ip(), "")) { |
| 540 jabber_google_send_jingle_info(js); | |
| 541 } | |
| 542 } else if (purple_network_get_stun_ip() == NULL || | |
| 543 purple_strequal(purple_network_get_stun_ip(), "")) { | |
| 539 js->srv_query_data = | 544 js->srv_query_data = |
| 540 purple_srv_resolve("stun", "udp", js->user->domain, | 545 purple_srv_resolve("stun", "udp", js->user->domain, |
| 541 jabber_disco_stun_srv_resolve_cb, js); | 546 jabber_disco_stun_srv_resolve_cb, js); |
| 542 /* TODO: add TURN support later... */ | 547 /* TODO: add TURN support later... */ |
| 543 } | 548 } |
