comparison libpurple/protocols/oscar/oscar.c @ 20778:8174f6999308

Sprinkle gc->wants_to_die = TRUE liberally around connection errors that really ought to have been setting it already so that it is always set when a disconnection reason is fatal. In a couple of other places, fix the reason to be more accurate and not be fatal.

20777:c40416c4eca6

	if (!aim_snvalid(purple_account_get_username(account))) {
		gchar *buf;
		buf = g_strdup_printf(_("Unable to login: Could not sign on as %s because the screen name is invalid.  Screen names must be a valid email address, or start with a letter and contain only letters, numbers and spaces, or contain only numbers."), purple_account_get_username(account));
		gc->wants_to_die = TRUE;
		purple_connection_error_reason(gc, PURPLE_REASON_AUTHENTICATION_FAILED, buf);
		g_free(buf);
	}

	if (aim_snvalid_icq((purple_account_get_username(account)))) {
		od->icq = TRUE;

			/* IP address connecting too frequently */
			gc->wants_to_die = TRUE;
			purple_connection_error_reason(gc, PURPLE_REASON_OTHER_ERROR, _("You have been connecting and disconnecting too frequently. Wait ten minutes and try again. If you continue to try, you will need to wait even longer."));
			break;
		default:
			purple_connection_error_reason(gc, PURPLE_REASON_NETWORK_ERROR, _("Authentication failed"));
			break;
		}
		purple_debug_info("oscar", "Login Error Code 0x%04hx\n", info->errorcode);
		purple_debug_info("oscar", "Error URL: %s\n", info->errorurl);
		return 1;

20778:8174f6999308

	if (!aim_snvalid(purple_account_get_username(account))) {
		gchar *buf;
		buf = g_strdup_printf(_("Unable to login: Could not sign on as %s because the screen name is invalid.  Screen names must be a valid email address, or start with a letter and contain only letters, numbers and spaces, or contain only numbers."), purple_account_get_username(account));
		gc->wants_to_die = TRUE;
		purple_connection_error_reason(gc, PURPLE_REASON_INVALID_SETTINGS, buf);
		g_free(buf);
	}

	if (aim_snvalid_icq((purple_account_get_username(account)))) {
		od->icq = TRUE;

			/* IP address connecting too frequently */
			gc->wants_to_die = TRUE;
			purple_connection_error_reason(gc, PURPLE_REASON_OTHER_ERROR, _("You have been connecting and disconnecting too frequently. Wait ten minutes and try again. If you continue to try, you will need to wait even longer."));
			break;
		default:
			gc->wants_to_die = TRUE;
			purple_connection_error_reason(gc, PURPLE_REASON_AUTHENTICATION_FAILED, _("Authentication failed"));
			break;
		}
		purple_debug_info("oscar", "Login Error Code 0x%04hx\n", info->errorcode);
		purple_debug_info("oscar", "Error URL: %s\n", info->errorurl);
		return 1;