pidgin: 465c5796: Clarify an error condition I was able to...

rekkanoryo at pidgin.im rekkanoryo at pidgin.im
Sat Apr 3 14:15:46 EDT 2010


-----------------------------------------------------------------
Revision: 465c5796090f150d2555e873a0b38b61d7dbe0ac
Ancestor: 9ffe748df9c2833c55985336ee41a415c4007e1f
Author: rekkanoryo at pidgin.im
Date: 2010-04-03T18:11:43
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/465c5796090f150d2555e873a0b38b61d7dbe0ac

Modified files:
        libpurple/protocols/yahoo/libymsg.c

ChangeLog: 

Clarify an error condition I was able to duplicate reliably last night.

-------------- next part --------------
============================================================
--- libpurple/protocols/yahoo/libymsg.c	c77bac81b5360092ad2746ba9698fd8ae7e5ba88
+++ libpurple/protocols/yahoo/libymsg.c	3c75a9bd7621e4bbd428e40d6e285155c930b705
@@ -1894,7 +1894,8 @@ static void yahoo_auth16_stage1_cb(Purpl
 					break;
 				case 1213:
 					/* security lock from too many failed login attempts */
-					error_reason = g_strdup(_("Account locked: Too many failed login attempts.  Logging into the Yahoo! website may fix this."));
+					error_reason = g_strdup(_("Account locked: Too many failed login "
+								"attempts.  Logging into the Yahoo! website may fix this."));
 					error = PURPLE_CONNECTION_ERROR_OTHER_ERROR;
 					break;
 				case 1235:
@@ -1903,9 +1904,16 @@ static void yahoo_auth16_stage1_cb(Purpl
 					error = PURPLE_CONNECTION_ERROR_INVALID_USERNAME;
 					break;
 				case 1214:
+					/* indicates a lock of some description */
+					error_reason = g_strdup(_("Account locked: Unknown reason.  Logging "
+								"into the Yahoo! website may fix this."));
+					error = PURPLE_CONNECTION_ERROR_OTHER_ERROR;
+					break;
 				case 1236:
-					/* indicates a lock of some description */
-					error_reason = g_strdup(_("Account locked: Unknown reason.  Logging into the Yahoo! website may fix this."));
+					/* indicates a lock due to logging in too frequently */
+					error_reason = g_strdup(_("Account locked: You have been logging in too "
+								"frequently.  Wait a few minutes before trying to connect "
+								"again.  Logging into the Yahoo! website may help."));
 					error = PURPLE_CONNECTION_ERROR_OTHER_ERROR;
 					break;
 				case 100:


More information about the Commits mailing list