# HG changeset patch # User Evan Schoenberg # Date 1172444545 0 # Node ID 7ac07c5fb1c230873477cd05daab0f59fb6f07d5 # Parent d253c87a6a1f6d375afed30b0346f05295aeeb28 No changes; fixed a bunch of whitespace problems made by a text editor with 'use tabs' disabled. Sorry for the noise. diff -r d253c87a6a1f -r 7ac07c5fb1c2 libpurple/dnsquery.c --- a/libpurple/dnsquery.c Sun Feb 25 21:41:59 2007 +0000 +++ b/libpurple/dnsquery.c Sun Feb 25 23:02:25 2007 +0000 @@ -119,13 +119,13 @@ static gboolean gaim_dnsquery_ui_resolve(GaimDnsQueryData *query_data) { - GaimDnsQueryUiOps *ops = gaim_dnsquery_get_ui_ops(); + GaimDnsQueryUiOps *ops = gaim_dnsquery_get_ui_ops(); - if (ops && ops->resolve_host) - { - if (ops->resolve_host(query_data, gaim_dnsquery_resolved, gaim_dnsquery_failed)) - return TRUE; - } + if (ops && ops->resolve_host) + { + if (ops->resolve_host(query_data, gaim_dnsquery_resolved, gaim_dnsquery_failed)) + return TRUE; + } return FALSE; } @@ -390,9 +390,9 @@ /** * @return TRUE if the request was sent succesfully. FALSE - * if the request could not be sent. This isn't - * necessarily an error. If the child has expired, - * for example, we won't be able to send the message. + * if the request could not be sent. This isn't + * necessarily an error. If the child has expired, + * for example, we won't be able to send the message. */ static gboolean send_dns_request_to_child(GaimDnsQueryData *query_data, @@ -471,13 +471,13 @@ query_data = queued_requests->data; queued_requests = g_slist_delete_link(queued_requests, queued_requests); - if (gaim_dnsquery_ui_resolve(query_data)) - { - /* The UI is handling the resolve; we're done */ - handle_next_queued_request(); - return; - } - + if (gaim_dnsquery_ui_resolve(query_data)) + { + /* The UI is handling the resolve; we're done */ + 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 @@ -601,7 +601,7 @@ GaimDnsQueryData *query_data; g_return_val_if_fail(hostname != NULL, NULL); - g_return_val_if_fail(port != 0, NULL); + g_return_val_if_fail(port != 0, NULL); g_return_val_if_fail(callback != NULL, NULL); query_data = g_new(GaimDnsQueryData, 1); @@ -727,11 +727,11 @@ query_data = data; query_data->timeout = 0; - if (gaim_dnsquery_ui_resolve(query_data)) - { - /* The UI is handling the resolve; we're done */ - return FALSE; - } + if (gaim_dnsquery_ui_resolve(query_data)) + { + /* The UI is handling the resolve; we're done */ + return FALSE; + } if (inet_aton(query_data->hostname, &sin.sin_addr)) { @@ -774,7 +774,7 @@ GaimDnsQueryData *query_data; g_return_val_if_fail(hostname != NULL, NULL); - g_return_val_if_fail(port != 0, NULL); + g_return_val_if_fail(port != 0, NULL); g_return_val_if_fail(callback != NULL, NULL); gaim_debug_info("dnsquery", "Performing DNS lookup for %s\n", hostname); @@ -817,11 +817,11 @@ query_data = data; query_data->timeout = 0; - if (gaim_dnsquery_ui_resolve(query_data)) - { - /* The UI is handling the resolve; we're done */ - return FALSE; - } + if (gaim_dnsquery_ui_resolve(query_data)) + { + /* The UI is handling the resolve; we're done */ + return FALSE; + } if (!inet_aton(query_data->hostname, &sin.sin_addr)) { struct hostent *hp; @@ -854,7 +854,7 @@ GaimDnsQueryData *query_data; g_return_val_if_fail(hostname != NULL, NULL); - g_return_val_if_fail(port != 0, NULL); + g_return_val_if_fail(port != 0, NULL); g_return_val_if_fail(callback != NULL, NULL); query_data = g_new(GaimDnsQueryData, 1); @@ -881,10 +881,10 @@ void gaim_dnsquery_destroy(GaimDnsQueryData *query_data) { - GaimDnsQueryUiOps *ops = gaim_dnsquery_get_ui_ops(); + GaimDnsQueryUiOps *ops = gaim_dnsquery_get_ui_ops(); - if (ops && ops->destroy) - ops->destroy(query_data); + if (ops && ops->destroy) + ops->destroy(query_data); #if defined(__unix__) || defined(__APPLE__) queued_requests = g_slist_remove(queued_requests, query_data); @@ -940,7 +940,7 @@ { g_return_val_if_fail(query_data != NULL, 0); - return query_data->port; + return query_data->port; } void diff -r d253c87a6a1f -r 7ac07c5fb1c2 libpurple/dnsquery.h --- a/libpurple/dnsquery.h Sun Feb 25 21:41:59 2007 +0000 +++ b/libpurple/dnsquery.h Sun Feb 25 23:02:25 2007 +0000 @@ -49,14 +49,14 @@ */ typedef struct { - /* If implemented, the UI is responsible for DNS queries */ - gboolean (*resolve_host)(GaimDnsQueryData *query_data, GaimDnsQueryResolvedCallback resolved_cb, GaimDnsQueryFailedCallback failed_cb); - - /* After destroy is called, query_data will be feed, so this must - * cancel any further use of it the UI would do. Unneeded if - * resolve_host is not implemented. - */ - void (*destroy)(GaimDnsQueryData *query_data); + /* If implemented, the UI is responsible for DNS queries */ + gboolean (*resolve_host)(GaimDnsQueryData *query_data, GaimDnsQueryResolvedCallback resolved_cb, GaimDnsQueryFailedCallback failed_cb); + + /* After destroy is called, query_data will be feed, so this must + * cancel any further use of it the UI would do. Unneeded if + * resolve_host is not implemented. + */ + void (*destroy)(GaimDnsQueryData *query_data); } GaimDnsQueryUiOps; #ifdef __cplusplus