Mercurial > pidgin.yaz
comparison libpurple/protocols/simple/simple.c @ 31932:b671728e6ee9
Use the new account-contextual DNS API everywhere. Refs #11110
author | Daniel Atallah <daniel.atallah@gmail.com> |
---|---|
date | Tue, 19 Apr 2011 05:05:25 +0000 |
parents | 7c33eaed54e5 |
children | f71b6a715cc7 |
comparison
equal
deleted
inserted
replaced
31931:c6193e7def81 | 31932:b671728e6ee9 |
---|---|
1901 return; | 1901 return; |
1902 } | 1902 } |
1903 } else { /* UDP */ | 1903 } else { /* UDP */ |
1904 purple_debug_info("simple", "using udp with server %s and port %d\n", hostname, port); | 1904 purple_debug_info("simple", "using udp with server %s and port %d\n", hostname, port); |
1905 | 1905 |
1906 sip->query_data = purple_dnsquery_a(hostname, port, simple_udp_host_resolved, sip); | 1906 sip->query_data = purple_dnsquery_a_account(sip->account, hostname, |
1907 port, simple_udp_host_resolved, sip); | |
1907 if (sip->query_data == NULL) { | 1908 if (sip->query_data == NULL) { |
1908 purple_connection_error_reason(sip->gc, | 1909 purple_connection_error_reason(sip->gc, |
1909 PURPLE_CONNECTION_ERROR_NETWORK_ERROR, | 1910 PURPLE_CONNECTION_ERROR_NETWORK_ERROR, |
1910 _("Unable to resolve hostname")); | 1911 _("Unable to resolve hostname")); |
1911 } | 1912 } |
1963 hosttoconnect = sip->servername; | 1964 hosttoconnect = sip->servername; |
1964 } else { | 1965 } else { |
1965 hosttoconnect = purple_account_get_string(account, "proxy", sip->servername); | 1966 hosttoconnect = purple_account_get_string(account, "proxy", sip->servername); |
1966 } | 1967 } |
1967 | 1968 |
1968 sip->srv_query_data = purple_srv_resolve("sip", | 1969 sip->srv_query_data = purple_srv_resolve_account(account, "sip", |
1969 sip->udp ? "udp" : "tcp", hosttoconnect, srvresolved, sip); | 1970 sip->udp ? "udp" : "tcp", hosttoconnect, srvresolved, sip); |
1970 } | 1971 } |
1971 | 1972 |
1972 static void simple_close(PurpleConnection *gc) | 1973 static void simple_close(PurpleConnection *gc) |
1973 { | 1974 { |