Mercurial > pidgin.yaz
changeset 31892:c7af571e5b79
merge of '8225619bc6916576c4c3ba198c023dbba87d8f95'
and 'cf60754e39ca2f5aa7f21f3f766366cd840e871c'
| author | John Bailey <rekkanoryo@rekkanoryo.org> |
|---|---|
| date | Mon, 28 Mar 2011 21:55:24 +0000 |
| parents | 25d12d5929e0 (diff) 4a26e623aeac (current diff) |
| children | 1551c9a140fd 91df50ae5e26 |
| files | |
| diffstat | 1 files changed, 2 insertions(+), 14 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/dnssrv.c Mon Mar 28 21:54:57 2011 +0000 +++ b/libpurple/dnssrv.c Mon Mar 28 21:55:24 2011 +0000 @@ -711,7 +711,7 @@ g_free(hostname); query_data = g_new0(PurpleSrvTxtQueryData, 1); - query_data->type = T_SRV; + query_data->type = PurpleDnsTypeSrv; query_data->cb.srv = cb; query_data->extradata = extradata; query_data->query = query; @@ -774,12 +774,6 @@ initialized = TRUE; } - query_data = g_new0(PurpleSrvTxtQueryData, 1); - query_data->type = DNS_TYPE_SRV; - query_data->cb.srv = cb; - query_data->query = query; - query_data->extradata = extradata; - if (!MyDnsQuery_UTF8 || !MyDnsRecordListFree) query_data->error_message = g_strdup("System missing DNS API (Requires W2K+)\n"); else { @@ -832,7 +826,7 @@ g_free(hostname); query_data = g_new0(PurpleSrvTxtQueryData, 1); - query_data->type = T_TXT; + query_data->type = PurpleDnsTypeTxt; query_data->cb.txt = cb; query_data->extradata = extradata; query_data->query = query; @@ -896,12 +890,6 @@ initialized = TRUE; } - query_data = g_new0(PurpleSrvTxtQueryData, 1); - query_data->type = DNS_TYPE_TXT; - query_data->cb.txt = cb; - query_data->query = query; - query_data->extradata = extradata; - if (!MyDnsQuery_UTF8 || !MyDnsRecordListFree) query_data->error_message = g_strdup("System missing DNS API (Requires W2K+)\n"); else {