comparison: libpurple/dnsquery.c
libpurple/dnsquery.c
- changeset 24324
- a36c5d08a43c
- parent 24323
- fe88d45063e8
- child 24325
- 9b63613e82ab
equal
deleted
inserted
replaced
| 24323:fe88d45063e8 | 24324:a36c5d08a43c |
|---|---|
| 488 return; | 488 return; |
| 489 | 489 |
| 490 query_data = queued_requests->data; | 490 query_data = queued_requests->data; |
| 491 queued_requests = g_slist_delete_link(queued_requests, queued_requests); | 491 queued_requests = g_slist_delete_link(queued_requests, queued_requests); |
| 492 | 492 |
| 493 if (purple_dnsquery_ui_resolve(query_data)) | |
| 494 { | |
| 495 /* The UI is handling the resolve; we're done */ | |
| 496 handle_next_queued_request(); | |
| 497 return; | |
| 498 } | |
| 499 | |
| 500 /* | 493 /* |
| 501 * If we have any children, attempt to have them perform the DNS | 494 * If we have any children, attempt to have them perform the DNS |
| 502 * query. If we're able to send the query then resolver will be | 495 * query. If we're able to send the query then resolver will be |
| 503 * set to the PurpleDnsQueryResolverProcess. Otherwise, resolver | 496 * set to the PurpleDnsQueryResolverProcess. Otherwise, resolver |
| 504 * will be NULL and we'll need to create a new DNS request child. | 497 * will be NULL and we'll need to create a new DNS request child. |
| 605 { | 598 { |
| 606 PurpleDnsQueryData *query_data; | 599 PurpleDnsQueryData *query_data; |
| 607 | 600 |
| 608 query_data = data; | 601 query_data = data; |
| 609 query_data->timeout = 0; | 602 query_data->timeout = 0; |
| 603 | |
| 604 if (purple_dnsquery_ui_resolve(query_data)) | |
| 605 { | |
| 606 /* The UI is handling the resolve; we're done */ | |
| 607 return FALSE; | |
| 608 } | |
| 610 | 609 |
| 611 handle_next_queued_request(); | 610 handle_next_queued_request(); |
| 612 | 611 |
| 613 return FALSE; | 612 return FALSE; |
| 614 } | 613 } |
