# HG changeset patch
# User Paul Aurich <paul@darkrain42.org>
# Date 1242881380 0
# Node ID 5541ea5e9d1e02b07b67baefa58a977c0a17dda2
# Parent  cf373257effbc712647f78570cdfb7067c5bd544# Parent  c9ac5cc1e46c5818d1227261235a3ccb9581fd30
merge of '1864a53b79ca34679ff68b45b52e7385608e46cc'
     and '269c9bb016ef464d143d1bbd66dca0fa03030aa3'

diff -r c9ac5cc1e46c -r 5541ea5e9d1e ChangeLog
--- a/ChangeLog	Wed May 20 15:59:04 2009 +0000
+++ b/ChangeLog	Thu May 21 04:49:40 2009 +0000
@@ -7,7 +7,7 @@
 	* Voice & Video framework in libpurple, thanks to Mike Ruprecht's summer
 	  of code project in 2008.
 	* It should no longer be possible to end up with duplicates of buddies
-	  in a group on the buddy list.
+	  in a group on the buddy list. (Paul Aurich)
 	* Removed the unmaintained and unneeded toc protocol plugin.
 	* Fixed NTLM authentication on big-endian systems.
 
@@ -20,7 +20,8 @@
 	XMPP:
 	* Voice & Video support with Jingle (XEP-0166, 0167, 0176, & 0177), and
 	  voice support with GTalk and GMail. (Mike "Maiku" Ruprecht)
-	* Support for in-band bytestreams for file transfers (XEP-0047).
+	* Support for in-band bytestreams for file transfers (XEP-0047). (Marcus
+	  Lundblad)
 	* Support for sending and receiving attentions (equivalent to "buzz"
 	  and "nudge") using the command /buzz. (XEP-0224)
 	* Support for connecting using BOSH. (Tobias Markmann)
@@ -40,9 +41,9 @@
 	  contains formatting.
 	* Show when the user was last logged in when doing "Get Info" on an offline
 	  buddy, provided the server supports it.
-	* Support custom smileys in MUCs (only when all participants supports the
+	* Support custom smileys in MUCs (only when all participants support the
 	  "Bits of Binary" extension, and a maximum of 10 participants are in the
-	  chat (to avoid getting too many fetch requests).
+	  chat to avoid getting too many fetch requests).
 
 	Yahoo:
 	* P2P file transfers. (Sulabh Mahajan)
@@ -50,6 +51,11 @@
 	  (Sulabh Mahajan)
 	* Sending text messages (address to +<countrycode><phone number>).
 	  (Sulabh Mahajan)
+	* Addition of MSN buddies to Yahoo accounts by adding them as
+	  'msn/buddy@somedomain.com' is now supported.  (Sulabh Mahajan)
+	* Yahoo Protocol 16 support, including new HTTPS login method; this should
+	  fix a number of login problems that have recently cropped up.  (Sulabh
+	  Mahajan, Mike "Maiku" Ruprecht)
 
 	Pidgin:
 	* Added -f command line option to tell Pidgin to ignore NetworkManager
diff -r c9ac5cc1e46c -r 5541ea5e9d1e libpurple/dnsquery.c
--- a/libpurple/dnsquery.c	Wed May 20 15:59:04 2009 +0000
+++ b/libpurple/dnsquery.c	Thu May 21 04:49:40 2009 +0000
@@ -256,6 +256,9 @@
 		 * library.
 		 */
 		hints.ai_socktype = SOCK_STREAM;
+#ifdef AI_ADDRCONFIG
+		hints.ai_flags |= AI_ADDRCONFIG;
+#endif /* AI_ADDRCONFIG */
 		rc = getaddrinfo(dns_params.hostname, servname, &hints, &res);
 		write_to_parent(child_out, &rc, sizeof(rc));
 		if (rc != 0) {
@@ -706,6 +709,9 @@
 	 * library.
 	 */
 	hints.ai_socktype = SOCK_STREAM;
+#ifdef AI_ADDRCONFIG
+	hints.ai_flags |= AI_ADDRCONFIG;
+#endif /* AI_ADDRCONFIG */
 	if ((rc = getaddrinfo(query_data->hostname, servname, &hints, &res)) == 0) {
 		tmp = res;
 		while(res) {