comparison: libpurple/protocols/yahoo/libymsg.c
libpurple/protocols/yahoo/libymsg.c
- branch
- soc.2008.masterpassword
- changeset 34029
- 059c1270db1f
- parent 34028
- a3050b6df38e
- child 34091
- 9a23c6eaec25
equal
deleted
inserted
replaced
| 34028:a3050b6df38e | 34029:059c1270db1f |
|---|---|
| 156 YahooFederation fed = YAHOO_FEDERATION_NONE; | 156 YahooFederation fed = YAHOO_FEDERATION_NONE; |
| 157 char *fedname = NULL; | 157 char *fedname = NULL; |
| 158 | 158 |
| 159 if (pkt->service == YAHOO_SERVICE_LOGOFF && pkt->status == -1) { | 159 if (pkt->service == YAHOO_SERVICE_LOGOFF && pkt->status == -1) { |
| 160 if (!purple_account_get_remember_password(account)) | 160 if (!purple_account_get_remember_password(account)) |
| 161 purple_account_set_password(account, NULL, NULL, NULL, NULL); | 161 purple_account_set_password(account, NULL, NULL, NULL); |
| 162 purple_connection_error(gc, PURPLE_CONNECTION_ERROR_NAME_IN_USE, | 162 purple_connection_error(gc, PURPLE_CONNECTION_ERROR_NAME_IN_USE, |
| 163 _("You have signed on from another location")); | 163 _("You have signed on from another location")); |
| 164 return; | 164 return; |
| 165 } | 165 } |
| 166 | 166 |
| 1957 break; | 1957 break; |
| 1958 case 1212: | 1958 case 1212: |
| 1959 /* Password incorrect */ | 1959 /* Password incorrect */ |
| 1960 /* Set password to NULL. Avoids account locking. Brings dialog to enter password if clicked on Re-enable account */ | 1960 /* Set password to NULL. Avoids account locking. Brings dialog to enter password if clicked on Re-enable account */ |
| 1961 if (!purple_account_get_remember_password(account)) | 1961 if (!purple_account_get_remember_password(account)) |
| 1962 purple_account_set_password(account, NULL, NULL, NULL, NULL); | 1962 purple_account_set_password(account, NULL, NULL, NULL); |
| 1963 error_reason = g_strdup(_("Incorrect password")); | 1963 error_reason = g_strdup(_("Incorrect password")); |
| 1964 error = PURPLE_CONNECTION_ERROR_AUTHENTICATION_FAILED; | 1964 error = PURPLE_CONNECTION_ERROR_AUTHENTICATION_FAILED; |
| 1965 break; | 1965 break; |
| 1966 case 1213: | 1966 case 1213: |
| 1967 /* security lock from too many failed login attempts */ | 1967 /* security lock from too many failed login attempts */ |
| 2254 yd->url_datas = g_slist_prepend(yd->url_datas, url_data); | 2254 yd->url_datas = g_slist_prepend(yd->url_datas, url_data); |
| 2255 return; | 2255 return; |
| 2256 } | 2256 } |
| 2257 #endif /* TRY_WEBMESSENGER_LOGIN */ | 2257 #endif /* TRY_WEBMESSENGER_LOGIN */ |
| 2258 if (!purple_account_get_remember_password(account)) | 2258 if (!purple_account_get_remember_password(account)) |
| 2259 purple_account_set_password(account, NULL, NULL, NULL, NULL); | 2259 purple_account_set_password(account, NULL, NULL, NULL); |
| 2260 | 2260 |
| 2261 msg = g_strdup(_("Invalid username or password")); | 2261 msg = g_strdup(_("Invalid username or password")); |
| 2262 reason = PURPLE_CONNECTION_ERROR_AUTHENTICATION_FAILED; | 2262 reason = PURPLE_CONNECTION_ERROR_AUTHENTICATION_FAILED; |
| 2263 break; | 2263 break; |
| 2264 case 14: | 2264 case 14: |
