adium.1-3: 898b964a: disapproval of revision 'a139b8af0bc2e07...

[zacw at adiumx.com]

-----------------------------------------------------------------
Revision: 898b964a967c87502f1793757b405e60879021ae
Ancestor: a139b8af0bc2e07bf3fc4a65620d2cfbbf14b047
Author: zacw at adiumx.com
Date: 2009-07-09T20:47:01
Branch: im.pidgin.adium.1-3
URL: http://d.pidgin.im/viewmtn/revision/info/898b964a967c87502f1793757b405e60879021ae

Modified files:
        libpurple/protocols/jabber/google.c
        libpurple/protocols/yahoo/yahoo.c

ChangeLog: 

disapproval of revision 'a139b8af0bc2e07bf3fc4a65620d2cfbbf14b047'
-------------- next part --------------
============================================================
--- libpurple/protocols/jabber/google.c	8b8baafe4f163a6b35faa8d5947f87027aa13d20
+++ libpurple/protocols/jabber/google.c	eb36981db65b68f60823a3f2d2609b5bc690ae21
@@ -180,25 +180,10 @@ void jabber_gmail_init(JabberStream *js)
 
 void jabber_gmail_init(JabberStream *js) {
 	JabberIq *iq;
-	xmlnode *usersetting, *mailnotifications;
 
-	if (!purple_account_get_check_mail(purple_connection_get_account(js->gc)))
+	if (!purple_account_get_check_mail(js->gc->account))
 		return;
 
-	/*
-	 * Quoting http://code.google.com/apis/talk/jep_extensions/usersettings.html:
-	 * To ensure better compatibility with other clients, rather than
-	 * setting this value to "false" to turn off notifications, it is
-	 * recommended that a client set this to "true" and filter incoming
-	 * email notifications itself.
-	 */
-	iq = jabber_iq_new(js, JABBER_IQ_SET);
-	usersetting = xmlnode_new_child(iq->node, "usersetting");
-	xmlnode_set_namespace(usersetting, "google:setting");
-	mailnotifications = xmlnode_new_child(usersetting, "mailnotifications");
-	xmlnode_set_attrib(mailnotifications, "value", "true");
-	jabber_iq_send(iq);
-
 	iq = jabber_iq_new_query(js, JABBER_IQ_GET, "google:mail:notify");
 	jabber_iq_set_callback(iq, jabber_gmail_parse, NULL);
 	jabber_iq_send(iq);
============================================================
--- libpurple/protocols/yahoo/yahoo.c	4cec01c07623081386bbc21a64d8cce83f6bc3b0
+++ libpurple/protocols/yahoo/yahoo.c	c2559a05aa07ddab2c2f637989edc7f5061dbd81
@@ -1485,7 +1485,7 @@ static void yahoo_auth16_stage2(PurpleUt
 #if GLIB_CHECK_VERSION(2,6,0)
 		totalelements = g_strv_length(split_data);
 #else
-		while (split_data[++totalelements] != NULL);
+		while (split_data[++totalelements] != NULL);	
 #endif
 		if (totalelements >= 4) {
 			response_no = strtol(split_data[0], NULL, 10);
@@ -1571,12 +1571,10 @@ static void yahoo_auth16_stage1_cb(Purpl
 #if GLIB_CHECK_VERSION(2,6,0)
 		totalelements = g_strv_length(split_data);
 #else
-		while (split_data[++totalelements] != NULL);
+		while (split_data[++totalelements] != NULL);	
 #endif
-		if(totalelements == 1)
+		if(totalelements >= 2) {
 			response_no = strtol(split_data[0], NULL, 10);
-		else if(totalelements >= 2) {
-			response_no = strtol(split_data[0], NULL, 10);
 			token = g_strdup(split_data[1] + strlen("ymsgr="));
 		}
 
@@ -1595,9 +1593,6 @@ static void yahoo_auth16_stage1_cb(Purpl
 					break;
 				case 1212:
 					/* Password incorrect */
-					/* Set password to NULL. Avoids account locking. Brings dialog to enter password if clicked on Re-enable account */
-					if (!purple_account_get_remember_password(purple_connection_get_account(gc)))
-						purple_account_set_password(purple_connection_get_account(gc), NULL);
 					error_reason = g_strdup(_("Incorrect Password"));
 					error = PURPLE_CONNECTION_ERROR_AUTHENTICATION_FAILED;
 					break;