Mercurial > pidgin
changeset 26927:ef132bfb0793
merge of '4ba10f028ed5e73f7fe9f00b3131844819ed85a6'
and '70479082260072a56b0aea40ccca311822c17155'
| author | Etan Reisner <pidgin@unreliablesource.net> |
|---|---|
| date | Fri, 22 May 2009 00:38:45 +0000 |
| parents | 3e83f63b16b4 (current diff) fdd2952d8639 (diff) |
| children | 4023cee127c6 |
| files | |
| diffstat | 4 files changed, 18 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Wed May 20 01:09:04 2009 +0000 +++ b/ChangeLog Fri May 22 00:38:45 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
--- a/libpurple/dnsquery.c Wed May 20 01:09:04 2009 +0000 +++ b/libpurple/dnsquery.c Fri May 22 00:38:45 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) {
--- a/libpurple/protocols/jabber/presence.c Wed May 20 01:09:04 2009 +0000 +++ b/libpurple/protocols/jabber/presence.c Fri May 22 00:38:45 2009 +0000 @@ -361,10 +361,10 @@ if ((nick = xmlnode_get_child(vcard, "NICKNAME"))) { char *tmp = xmlnode_get_data(nick); char *bare_jid = jabber_get_bare_jid(from); - if (strstr(bare_jid, tmp) == NULL) { + if (tmp && strstr(bare_jid, tmp) == NULL) { g_free(nickname); nickname = tmp; - } else + } else if (tmp) g_free(tmp); g_free(bare_jid);