# HG changeset patch # User Elliott Sales de Andrade # Date 1314928645 0 # Node ID f22bc8b5b9dcf0fc698c04a1856e80287f7b079d # Parent 3340d322c8f80423a52bbf2ebf861466905ef26d Replace purple_dnsquery_a_account with purple_dnsquery_a. diff -r 3340d322c8f8 -r f22bc8b5b9dc ChangeLog.API --- a/ChangeLog.API Thu Sep 01 07:32:09 2011 +0000 +++ b/ChangeLog.API Fri Sep 02 01:57:25 2011 +0000 @@ -61,6 +61,7 @@ the first parameter * PurpleConnectionUiOps.report_disconnect now passes a PurpleConnectionError as the second parameter + * purple_dnsquery_a now takes a PurpleAccount as the first parameter Removed: * _GntFileType @@ -98,6 +99,7 @@ * PidginConversation.sg * purple_connection_error_reason * purple_core_migrate + * purple_dnsquery_a_account * purple_notify_searchresults_column_get_title * purple_notify_searchresults_get_columns_count * purple_notify_searchresults_get_rows_count @@ -107,7 +109,7 @@ * purple_strlcat * purple_strlcpy * purple_util_fetch_url_request_len_with_account. Use - purple_util_fetch_url_request_len, insetad. + purple_util_fetch_url_request_len, instead. * PurpleConnectionUiOps.report_disconnect_reason * struct _GtkIMHtmlFontDetail * struct _PurpleMenuAction diff -r 3340d322c8f8 -r f22bc8b5b9dc libpurple/dnsquery.c --- a/libpurple/dnsquery.c Thu Sep 01 07:32:09 2011 +0000 +++ b/libpurple/dnsquery.c Fri Sep 02 01:57:25 2011 +0000 @@ -914,7 +914,7 @@ } PurpleDnsQueryData * -purple_dnsquery_a_account(PurpleAccount *account, const char *hostname, int port, +purple_dnsquery_a(PurpleAccount *account, const char *hostname, int port, PurpleDnsQueryConnectFunction callback, gpointer data) { PurpleDnsQueryData *query_data; @@ -944,13 +944,6 @@ return query_data; } -PurpleDnsQueryData * -purple_dnsquery_a(const char *hostname, int port, - PurpleDnsQueryConnectFunction callback, gpointer data) -{ - return purple_dnsquery_a_account(NULL, hostname, port, callback, data); -} - void purple_dnsquery_destroy(PurpleDnsQueryData *query_data) { diff -r 3340d322c8f8 -r f22bc8b5b9dc libpurple/dnsquery.h --- a/libpurple/dnsquery.h Thu Sep 01 07:32:09 2011 +0000 +++ b/libpurple/dnsquery.h Fri Sep 02 01:57:25 2011 +0000 @@ -88,7 +88,7 @@ /** * Perform an asynchronous DNS query. * - * @param account the account that the query is being done for (or NULL) + * @param account The account that the query is being done for (or NULL) * @param hostname The hostname to resolve. * @param port A port number which is stored in the struct sockaddr. * @param callback The callback function to call after resolving. @@ -98,27 +98,8 @@ * a data structure that can be used to cancel the pending * DNS query, if needed. * - * @since 2.8.0 */ -PurpleDnsQueryData *purple_dnsquery_a_account(PurpleAccount *account, const char *hostname, int port, PurpleDnsQueryConnectFunction callback, gpointer data); - -#if !(defined PURPLE_DISABLE_DEPRECATED) || (defined _PURPLE_DNSQUERY_C_) -/** - * Perform an asynchronous DNS query. - * - * @param hostname The hostname to resolve. - * @param port A port number which is stored in the struct sockaddr. - * @param callback The callback function to call after resolving. - * @param data Extra data to pass to the callback function. - * - * @return NULL if there was an error, otherwise return a reference to - * a data structure that can be used to cancel the pending - * DNS query, if needed. - * - * @deprecated Use purple_dnsquery_a_account instead - */ -PurpleDnsQueryData *purple_dnsquery_a(const char *hostname, int port, PurpleDnsQueryConnectFunction callback, gpointer data); -#endif +PurpleDnsQueryData *purple_dnsquery_a(PurpleAccount *account, const char *hostname, int port, PurpleDnsQueryConnectFunction callback, gpointer data); /** * Cancel a DNS query and destroy the associated data structure. diff -r 3340d322c8f8 -r f22bc8b5b9dc libpurple/network.c --- a/libpurple/network.c Thu Sep 01 07:32:09 2011 +0000 +++ b/libpurple/network.c Fri Sep 02 01:57:25 2011 +0000 @@ -991,7 +991,7 @@ if (stun_server && stun_server[0] != '\0') { if (purple_network_is_available()) { purple_debug_info("network", "running DNS query for STUN server\n"); - purple_dnsquery_a_account(NULL, stun_server, 3478, purple_network_ip_lookup_cb, + purple_dnsquery_a(NULL, stun_server, 3478, purple_network_ip_lookup_cb, &stun_ip); } else { purple_debug_info("network", @@ -1009,7 +1009,7 @@ if (turn_server && turn_server[0] != '\0') { if (purple_network_is_available()) { purple_debug_info("network", "running DNS query for TURN server\n"); - purple_dnsquery_a_account(NULL, turn_server, + purple_dnsquery_a(NULL, turn_server, purple_prefs_get_int("/purple/network/turn_port"), purple_network_ip_lookup_cb, &turn_ip); } else { diff -r 3340d322c8f8 -r f22bc8b5b9dc libpurple/protocols/jabber/disco.c --- a/libpurple/protocols/jabber/disco.c Thu Sep 01 07:32:09 2011 +0000 +++ b/libpurple/protocols/jabber/disco.c Fri Sep 02 01:57:25 2011 +0000 @@ -485,7 +485,7 @@ resp[0].hostname, resp[0].port); account = purple_connection_get_account(js->gc); js->stun_query = - purple_dnsquery_a_account(account, resp[0].hostname, resp[0].port, + purple_dnsquery_a(account, resp[0].hostname, resp[0].port, jabber_disco_stun_lookup_cb, js); } } diff -r 3340d322c8f8 -r f22bc8b5b9dc libpurple/protocols/jabber/google/jingleinfo.c --- a/libpurple/protocols/jabber/google/jingleinfo.c Thu Sep 01 07:32:09 2011 +0000 +++ b/libpurple/protocols/jabber/google/jingleinfo.c Fri Sep 02 01:57:25 2011 +0000 @@ -117,7 +117,7 @@ purple_dnsquery_destroy(js->stun_query); account = purple_connection_get_account(js->gc); - js->stun_query = purple_dnsquery_a_account(account, host, port, + js->stun_query = purple_dnsquery_a(account, host, port, jabber_google_stun_lookup_cb, js); } } diff -r 3340d322c8f8 -r f22bc8b5b9dc libpurple/protocols/simple/simple.c --- a/libpurple/protocols/simple/simple.c Thu Sep 01 07:32:09 2011 +0000 +++ b/libpurple/protocols/simple/simple.c Fri Sep 02 01:57:25 2011 +0000 @@ -1904,7 +1904,7 @@ } else { /* UDP */ purple_debug_info("simple", "using udp with server %s and port %d\n", hostname, port); - sip->query_data = purple_dnsquery_a_account(sip->account, hostname, + sip->query_data = purple_dnsquery_a(sip->account, hostname, port, simple_udp_host_resolved, sip); if (sip->query_data == NULL) { purple_connection_error(sip->gc, diff -r 3340d322c8f8 -r f22bc8b5b9dc libpurple/protocols/yahoo/yahoo_filexfer.c --- a/libpurple/protocols/yahoo/yahoo_filexfer.c Thu Sep 01 07:32:09 2011 +0000 +++ b/libpurple/protocols/yahoo/yahoo_filexfer.c Fri Sep 02 01:57:25 2011 +0000 @@ -1681,13 +1681,13 @@ account = purple_connection_get_account(gc); if (yd->jp) { - purple_dnsquery_a_account(account, YAHOOJP_XFER_RELAY_HOST, + purple_dnsquery_a(account, YAHOOJP_XFER_RELAY_HOST, YAHOOJP_XFER_RELAY_PORT, yahoo_xfer_dns_connected_15, xfer); } else { - purple_dnsquery_a_account(account, YAHOO_XFER_RELAY_HOST, + purple_dnsquery_a(account, YAHOO_XFER_RELAY_HOST, YAHOO_XFER_RELAY_PORT, yahoo_xfer_dns_connected_15, xfer); } diff -r 3340d322c8f8 -r f22bc8b5b9dc libpurple/proxy.c --- a/libpurple/proxy.c Thu Sep 01 07:32:09 2011 +0000 +++ b/libpurple/proxy.c Fri Sep 02 01:57:25 2011 +0000 @@ -1369,7 +1369,7 @@ proxy_do_write(connect_data, connect_data->fd, PURPLE_INPUT_WRITE); } else { - connect_data->query_data = purple_dnsquery_a_account( + connect_data->query_data = purple_dnsquery_a( connect_data->account, connect_data->host, connect_data->port, s4_host_resolved, connect_data); @@ -2088,7 +2088,7 @@ /** * This function attempts to connect to the next IP address in the list - * of IP addresses returned to us by purple_dnsquery_a() and attemps + * of IP addresses returned to us by purple_dnsquery_a() and attempts * to connect to each one. This is called after the hostname is * resolved, and each time a connection attempt fails (assuming there * is another IP address to try). @@ -2317,7 +2317,7 @@ return NULL; } - connect_data->query_data = purple_dnsquery_a_account(account, connecthost, + connect_data->query_data = purple_dnsquery_a(account, connecthost, connectport, connection_host_resolved, connect_data); if (connect_data->query_data == NULL) { @@ -2385,7 +2385,7 @@ return NULL; } - connect_data->query_data = purple_dnsquery_a_account(account, connecthost, + connect_data->query_data = purple_dnsquery_a(account, connecthost, connectport, connection_host_resolved, connect_data); if (connect_data->query_data == NULL) { diff -r 3340d322c8f8 -r f22bc8b5b9dc libpurple/stun.c --- a/libpurple/stun.c Thu Sep 01 07:32:09 2011 +0000 +++ b/libpurple/stun.c Fri Sep 02 01:57:25 2011 +0000 @@ -365,7 +365,7 @@ purple_debug_info("stun", "got %d SRV responses, server: %s, port: %d\n", results, servername, port); - purple_dnsquery_a_account(NULL, servername, port, hbn_cb, NULL); + purple_dnsquery_a(NULL, servername, port, hbn_cb, NULL); g_free(resp); }