Skip to content

Commit ca66d0c

Browse files
committed
Rename l10n extended config
1 parent e2ffcca commit ca66d0c

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,13 @@ use agama_utils::api;
2424
use agama_utils::api::l10n::SystemInfo;
2525

2626
#[derive(Clone, PartialEq)]
27-
pub struct ExtendedConfig {
27+
pub struct Config {
2828
pub locale: LocaleId,
2929
pub keymap: KeymapId,
3030
pub timezone: TimezoneId,
3131
}
3232

33-
impl ExtendedConfig {
33+
impl Config {
3434
pub fn new_from(system: &SystemInfo) -> Self {
3535
Self {
3636
locale: system.locale.clone(),

rust/agama-l10n/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@ pub use service::Service;
4444
mod model;
4545
pub use model::{Model, ModelAdapter};
4646

47+
mod config;
4748
mod dbus;
48-
mod extended_config;
4949
pub mod helpers;
5050
pub mod message;
5151
mod monitor;

rust/agama-l10n/src/service.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
// To contact SUSE LLC about this file by physical or electronic mail, you may
1919
// find current contact information at www.suse.com.
2020

21-
use crate::extended_config::ExtendedConfig;
21+
use crate::config::Config;
2222
use crate::message;
2323
use crate::model::ModelAdapter;
2424
use agama_locale_data::{InvalidKeymapId, InvalidLocaleId, InvalidTimezoneId, KeymapId, LocaleId};
@@ -72,7 +72,7 @@ pub enum Error {
7272
/// * Applies the user configuration at the end of the installation.
7373
pub struct Service {
7474
system: SystemInfo,
75-
config: ExtendedConfig,
75+
config: Config,
7676
model: Box<dyn ModelAdapter + Send + 'static>,
7777
issues: Handler<issue::Service>,
7878
events: event::Sender,
@@ -85,7 +85,7 @@ impl Service {
8585
events: event::Sender,
8686
) -> Service {
8787
let system = model.read_system_info();
88-
let config = ExtendedConfig::new_from(&system);
88+
let config = Config::new_from(&system);
8989

9090
Self {
9191
system,
@@ -192,7 +192,7 @@ impl MessageHandler<message::SetConfig<api::l10n::Config>> for Service {
192192
&mut self,
193193
message: message::SetConfig<api::l10n::Config>,
194194
) -> Result<(), Error> {
195-
let config = ExtendedConfig::new_from(&self.system);
195+
let config = Config::new_from(&self.system);
196196
let merged = config.merge(&message.config)?;
197197
if merged == self.config {
198198
return Ok(());

0 commit comments

Comments
 (0)