adium: dca487cd: applied changes from e1119abd5c3f78ae3b1...

[evands at pidgin.im]

----------------------------------------------------------------------
Revision: dca487cd52fa87e4f31c9153a0ae63cebc3bbf79
Parent:   c1afdafdfe2e87fd820342082c0d691dbddcf79e
Author:   evands at pidgin.im
Date:     09/19/10 23:11:38
Branch:   im.pidgin.adium
URL: http://d.pidgin.im/viewmtn/revision/info/dca487cd52fa87e4f31c9153a0ae63cebc3bbf79

Changelog: 

applied changes from e1119abd5c3f78ae3b17c3a20ecb37d5ef001385
             through 9bb423c075e503083363981f5e96b3ad800182fd

Changes against parent c1afdafdfe2e87fd820342082c0d691dbddcf79e

  patched  ChangeLog
  patched  libpurple/protocols/jabber/auth_cyrus.c
  patched  libpurple/protocols/jabber/auth_plain.c

-------------- next part --------------
============================================================
--- ChangeLog	ca4f05efb6b4eb5e99f6ea5a6225dcbb26b414d7
+++ ChangeLog	1c317d8d53dabc7c978e30d32b58bb3009e7fb37
@@ -17,6 +17,16 @@ version 2.7.4 (MM/DD/YYYY):
 	  selected buddy.
 	* Add a plugin action menu (under Tools) for the Voice and Video
 	  Settings plugin.
+	* Use GRegex for the debug window where available. This brings regex
+	  filtering to the debug window on Windows. (Eion Robb) (#12601)
+	* 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 Send To menu can now be used if the active account in the
+	  conversation becomes disabled or inactive. (Keith Moyer) (#12471)
 
 	Finch:
 	* Add support for drop-down account options (like the SILC cipher
@@ -31,6 +41,12 @@ version 2.7.4 (MM/DD/YYYY):
 	  Stream ID. (#12331)
 	* 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
============================================================
--- libpurple/protocols/jabber/auth_cyrus.c	429a5ce61438bc4cad616e09901d5eef7c5520b7
+++ libpurple/protocols/jabber/auth_cyrus.c	2b5bdac361b313c988956c1dd20ce3ae10caf542
@@ -321,11 +321,8 @@ jabber_auth_start_cyrus(JabberStream *js
 		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) {
============================================================
--- libpurple/protocols/jabber/auth_plain.c	0cea8f0272a4cdf948cde0ecc7fc631b3a9754c9
+++ libpurple/protocols/jabber/auth_plain.c	65a514154d52ad5ff95bd2d8055bef78902ae042
@@ -40,11 +40,8 @@ static xmlnode *finish_plaintext_authent
 	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');