Mercurial > pidgin.yaz
changeset 30997:3f5ff1ea4802
jabber: Partial revert (everything but ChangeLog) of 945ef5abc5
It causes issues with non-GAfyD accounts associated with arbitrary
email addresses (since Google lets the user auth with that email
and then changes the JID to be "@gmail.com"). Fixes #a14153
| author | Paul Aurich <paul@darkrain42.org> |
|---|---|
| date | Mon, 20 Sep 2010 00:51:21 +0000 |
| parents | ef625abecdbb |
| children | 53dcfcc71953 |
| files | ChangeLog libpurple/protocols/jabber/auth_cyrus.c libpurple/protocols/jabber/auth_plain.c |
| diffstat | 3 files changed, 12 insertions(+), 13 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Sat Sep 18 22:27:49 2010 +0000 +++ b/ChangeLog Mon Sep 20 00:51:21 2010 +0000 @@ -24,9 +24,9 @@ * Add Google Chrome to the list of possible browsers on non-Windows systems. * Add Chromium to the list of possible browsers on non-Windows systems. - * The "Manual" browser option is now stored as a string. It is no longer - necessary to specify a full path to the browser command. (rtobar) - (#12024) + * The "Manual" browser option is now stored as a string. It is no + longer necessary to specify a full path to the browser command. + (rtobar) (#12024) * The Send To menu can now be used if the active account in the conversation becomes disabled or inactive. (Keith Moyer) (#12471) @@ -44,6 +44,11 @@ * Added support for using Google's relay servers when making voice and video calls to Google clients. * Fix detecting file transfer proxies advertised by the server. + * Advertise support for Google Talk's JID Domain Discovery extension + in all cases again (changed in 2.7.0), not just when the domain + is "gmail.com" or "googlemail.com" (it's also needed for Google + Talk used for accounts on arbitrary domains not using Google Apps + for Your Domain). (#a14153) Yahoo/Yahoo JAPAN: * Stop doing unnecessary lookups of certain alias information. This
--- a/libpurple/protocols/jabber/auth_cyrus.c Sat Sep 18 22:27:49 2010 +0000 +++ b/libpurple/protocols/jabber/auth_cyrus.c Mon Sep 20 00:51:21 2010 +0000 @@ -321,11 +321,8 @@ xmlnode_set_namespace(auth, NS_XMPP_SASL); xmlnode_set_attrib(auth, "mechanism", js->current_mech); - if (g_str_equal(js->user->domain, "gmail.com") || - g_str_equal(js->user->domain, "googlemail.com")) { - xmlnode_set_attrib(auth, "xmlns:ga", "http://www.google.com/talk/protocol/auth"); - xmlnode_set_attrib(auth, "ga:client-uses-full-bind-result", "true"); - } + xmlnode_set_attrib(auth, "xmlns:ga", "http://www.google.com/talk/protocol/auth"); + xmlnode_set_attrib(auth, "ga:client-uses-full-bind-result", "true"); if (clientout) { if (coutlen == 0) {
--- a/libpurple/protocols/jabber/auth_plain.c Sat Sep 18 22:27:49 2010 +0000 +++ b/libpurple/protocols/jabber/auth_plain.c Mon Sep 20 00:51:21 2010 +0000 @@ -40,11 +40,8 @@ auth = xmlnode_new("auth"); xmlnode_set_namespace(auth, NS_XMPP_SASL); - if (g_str_equal(js->user->domain, "gmail.com") || - g_str_equal(js->user->domain, "googlemail.com")) { - xmlnode_set_attrib(auth, "xmlns:ga", "http://www.google.com/talk/protocol/auth"); - xmlnode_set_attrib(auth, "ga:client-uses-full-bind-result", "true"); - } + xmlnode_set_attrib(auth, "xmlns:ga", "http://www.google.com/talk/protocol/auth"); + xmlnode_set_attrib(auth, "ga:client-uses-full-bind-result", "true"); response = g_string_new(""); response = g_string_append_c(response, '\0');