Mercurial > pidgin.yaz
diff libpurple/dnsquery.c @ 29663:af5c36fe8d6f
propagate from branch 'im.pidgin.pidgin' (head e602a35f60e3d423d43bacc72fcb7239c8b43cf0)
to branch 'im.pidgin.cpw.attention_ui' (head d6e2d83ffb82d0028d802e5959d57de1d61b4faf)
author | Marcus Lundblad <ml@update.uu.se> |
---|---|
date | Tue, 13 Jan 2009 18:39:52 +0000 |
parents | 1596d09393cf |
children | 8290e36a5a73 |
line wrap: on
line diff
--- a/libpurple/dnsquery.c Thu Jan 01 21:19:11 2009 +0000 +++ b/libpurple/dnsquery.c Tue Jan 13 18:39:52 2009 +0000 @@ -274,7 +274,6 @@ res = res->ai_next; } freeaddrinfo(tmp); - write_to_parent(child_out, &zero, sizeof(zero)); #else if (!inet_aton(dns_params.hostname, &sin.sin_addr)) { struct hostent *hp; @@ -292,11 +291,12 @@ sin.sin_family = AF_INET; sin.sin_port = htons(dns_params.port); - write_to_parent(child_out, &zero, sizeof(zero)); + rc = 0; + write_to_parent(child_out, &rc, sizeof(rc)); write_to_parent(child_out, &addrlen, sizeof(addrlen)); write_to_parent(child_out, &sin, addrlen); +#endif write_to_parent(child_out, &zero, sizeof(zero)); -#endif dns_params.hostname[0] = '\0'; }