diff --git a/Cargo.lock b/Cargo.lock index 99c6c41..2d78e10 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1519,7 +1519,7 @@ dependencies = [ [[package]] name = "cosmic-config" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic#7d84d21129e0b4590fedf20b377da80b6a177b47" +source = "git+https://github.com/pop-os/libcosmic#8a0e74b189f53dae9b8001c6fa5cf1820b3ececb" dependencies = [ "atomicwrites", "cosmic-config-derive", @@ -1541,7 +1541,7 @@ dependencies = [ [[package]] name = "cosmic-config-derive" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic#7d84d21129e0b4590fedf20b377da80b6a177b47" +source = "git+https://github.com/pop-os/libcosmic#8a0e74b189f53dae9b8001c6fa5cf1820b3ececb" dependencies = [ "quote", "syn 1.0.109", @@ -1843,7 +1843,7 @@ dependencies = [ [[package]] name = "cosmic-theme" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic#7d84d21129e0b4590fedf20b377da80b6a177b47" +source = "git+https://github.com/pop-os/libcosmic#8a0e74b189f53dae9b8001c6fa5cf1820b3ececb" dependencies = [ "almost", "cosmic-config", @@ -3216,7 +3216,7 @@ dependencies = [ [[package]] name = "iced" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic#7d84d21129e0b4590fedf20b377da80b6a177b47" +source = "git+https://github.com/pop-os/libcosmic#8a0e74b189f53dae9b8001c6fa5cf1820b3ececb" dependencies = [ "dnd", "iced_accessibility", @@ -3234,7 +3234,7 @@ dependencies = [ [[package]] name = "iced_accessibility" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic#7d84d21129e0b4590fedf20b377da80b6a177b47" +source = "git+https://github.com/pop-os/libcosmic#8a0e74b189f53dae9b8001c6fa5cf1820b3ececb" dependencies = [ "accesskit", "accesskit_winit", @@ -3243,7 +3243,7 @@ dependencies = [ [[package]] name = "iced_core" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic#7d84d21129e0b4590fedf20b377da80b6a177b47" +source = "git+https://github.com/pop-os/libcosmic#8a0e74b189f53dae9b8001c6fa5cf1820b3ececb" dependencies = [ "bitflags 2.8.0", "bytes", @@ -3268,7 +3268,7 @@ dependencies = [ [[package]] name = "iced_futures" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic#7d84d21129e0b4590fedf20b377da80b6a177b47" +source = "git+https://github.com/pop-os/libcosmic#8a0e74b189f53dae9b8001c6fa5cf1820b3ececb" dependencies = [ "futures", "iced_core", @@ -3294,7 +3294,7 @@ dependencies = [ [[package]] name = "iced_graphics" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic#7d84d21129e0b4590fedf20b377da80b6a177b47" +source = "git+https://github.com/pop-os/libcosmic#8a0e74b189f53dae9b8001c6fa5cf1820b3ececb" dependencies = [ "bitflags 2.8.0", "bytemuck", @@ -3316,7 +3316,7 @@ dependencies = [ [[package]] name = "iced_renderer" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic#7d84d21129e0b4590fedf20b377da80b6a177b47" +source = "git+https://github.com/pop-os/libcosmic#8a0e74b189f53dae9b8001c6fa5cf1820b3ececb" dependencies = [ "iced_graphics", "iced_tiny_skia", @@ -3328,7 +3328,7 @@ dependencies = [ [[package]] name = "iced_runtime" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic#7d84d21129e0b4590fedf20b377da80b6a177b47" +source = "git+https://github.com/pop-os/libcosmic#8a0e74b189f53dae9b8001c6fa5cf1820b3ececb" dependencies = [ "bytes", "cosmic-client-toolkit", @@ -3344,7 +3344,7 @@ dependencies = [ [[package]] name = "iced_tiny_skia" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic#7d84d21129e0b4590fedf20b377da80b6a177b47" +source = "git+https://github.com/pop-os/libcosmic#8a0e74b189f53dae9b8001c6fa5cf1820b3ececb" dependencies = [ "bytemuck", "cosmic-text", @@ -3360,7 +3360,7 @@ dependencies = [ [[package]] name = "iced_wgpu" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic#7d84d21129e0b4590fedf20b377da80b6a177b47" +source = "git+https://github.com/pop-os/libcosmic#8a0e74b189f53dae9b8001c6fa5cf1820b3ececb" dependencies = [ "as-raw-xcb-connection", "bitflags 2.8.0", @@ -3391,7 +3391,7 @@ dependencies = [ [[package]] name = "iced_widget" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic#7d84d21129e0b4590fedf20b377da80b6a177b47" +source = "git+https://github.com/pop-os/libcosmic#8a0e74b189f53dae9b8001c6fa5cf1820b3ececb" dependencies = [ "cosmic-client-toolkit", "dnd", @@ -3410,7 +3410,7 @@ dependencies = [ [[package]] name = "iced_winit" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic#7d84d21129e0b4590fedf20b377da80b6a177b47" +source = "git+https://github.com/pop-os/libcosmic#8a0e74b189f53dae9b8001c6fa5cf1820b3ececb" dependencies = [ "cosmic-client-toolkit", "dnd", @@ -4415,7 +4415,7 @@ checksum = "b5aba8db14291edd000dfcc4d620c7ebfb122c613afb886ca8803fa4e128a20a" [[package]] name = "libcosmic" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic#7d84d21129e0b4590fedf20b377da80b6a177b47" +source = "git+https://github.com/pop-os/libcosmic#8a0e74b189f53dae9b8001c6fa5cf1820b3ececb" dependencies = [ "apply", "ashpd 0.9.2", diff --git a/cosmic-settings/src/pages/desktop/dock/mod.rs b/cosmic-settings/src/pages/desktop/dock/mod.rs index e853e54..a32f85e 100644 --- a/cosmic-settings/src/pages/desktop/dock/mod.rs +++ b/cosmic-settings/src/pages/desktop/dock/mod.rs @@ -130,7 +130,7 @@ impl Default for Page { .map(|c| match CosmicPanelConfig::get_entry(&c) { Ok(c) => c, Err((errs, c)) => { - for err in errs { + for err in errs.into_iter().filter(cosmic_config::Error::is_err) { tracing::error!(?err, "Failed to load Dock system config."); } c diff --git a/cosmic-settings/src/pages/desktop/panel/inner.rs b/cosmic-settings/src/pages/desktop/panel/inner.rs index 6d2379c..a59f72b 100644 --- a/cosmic-settings/src/pages/desktop/panel/inner.rs +++ b/cosmic-settings/src/pages/desktop/panel/inner.rs @@ -64,7 +64,7 @@ impl Default for PageInner { |c| match CosmicPanelContainerConfig::load_from_config(&c, true) { Ok(c) => c, Err((errs, c)) => { - for err in errs { + for err in errs.into_iter().filter(cosmic_config::Error::is_err) { tracing::error!(?err, "Error when loading Panel container config."); } c diff --git a/cosmic-settings/src/pages/desktop/panel/mod.rs b/cosmic-settings/src/pages/desktop/panel/mod.rs index f182965..ae0bffe 100644 --- a/cosmic-settings/src/pages/desktop/panel/mod.rs +++ b/cosmic-settings/src/pages/desktop/panel/mod.rs @@ -82,7 +82,7 @@ impl Default for Page { .map(|c| match CosmicPanelConfig::get_entry(&c) { Ok(c) => c, Err((errs, c)) => { - for err in errs { + for err in errs.into_iter().filter(cosmic_config::Error::is_err) { tracing::error!(?err, "Failed to load Panel system config."); } c