Mercurial > pidgin
changeset 15713:a34da2c2d8ba
merge of '0cf86336325db7dcb5ba69d37d700ab7cb957224'
and '4e9c057105e41efb8aa819d03a8fc30436bea28f'
| author | Daniel Atallah <daniel.atallah@gmail.com> |
|---|---|
| date | Sun, 25 Feb 2007 22:14:24 +0000 |
| parents | d253c87a6a1f (diff) b2b756b59d81 (current diff) |
| children | 2a673784fa56 557f37189a96 |
| files | |
| diffstat | 2 files changed, 7 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/dnsquery.c Sun Feb 25 22:13:58 2007 +0000 +++ b/libpurple/dnsquery.c Sun Feb 25 22:14:24 2007 +0000 @@ -477,7 +477,7 @@ handle_next_queued_request(); return; } - + /* * If we have any children, attempt to have them perform the DNS * query. If we're able to send the query then resolver will be @@ -935,10 +935,10 @@ return query_data->hostname; } -int +unsigned short gaim_dnsquery_get_port(GaimDnsQueryData *query_data) { - g_return_val_if_fail(query_data != NULL, -1); + g_return_val_if_fail(query_data != NULL, 0); return query_data->port; } @@ -952,8 +952,9 @@ GaimDnsQueryUiOps * gaim_dnsquery_get_ui_ops(void) { - g_return_val_if_fail(dns_query_ui_ops != NULL, NULL); - + /* It is perfectly acceptable for dns_query_ui_ops to be NULL; this just + * means that the default platform-specific implementation will be used. + */ return dns_query_ui_ops; }
--- a/libpurple/dnsquery.h Sun Feb 25 22:13:58 2007 +0000 +++ b/libpurple/dnsquery.h Sun Feb 25 22:14:24 2007 +0000 @@ -121,7 +121,7 @@ * @param query_data The DNS query * @return The port. */ -int gaim_dnsquery_get_port(GaimDnsQueryData *query_data); +unsigned short gaim_dnsquery_get_port(GaimDnsQueryData *query_data); /** * Initializes the DNS query subsystem.