leyoda/cosmic-settings
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

chore: update libcosmic

Browse source
This commit is contained in:
Michael Aaron Murphy 2025-02-14 22:47:44 +01:00
parent 66a9507dc2
commit 9c274a759b
No known key found for this signature in database
GPG key ID: B2732D4240C9212C
7 changed files with 30 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

30
Cargo.lock generated
View file

@ -1519,7 +1519,7 @@ dependencies = [
[[package]] [[package]]
name = "cosmic-config" name = "cosmic-config"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/pop-os/libcosmic#ccc1068d9fd894334feef7d50a7a2b6930c7a34f" source = "git+https://github.com/pop-os/libcosmic#580db26868a67aba768669fc3762e81a93e0fb85"
dependencies = [ dependencies = [
"atomicwrites", "atomicwrites",
"cosmic-config-derive", "cosmic-config-derive",
@ -1541,7 +1541,7 @@ dependencies = [
[[package]] [[package]]
name = "cosmic-config-derive" name = "cosmic-config-derive"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/pop-os/libcosmic#ccc1068d9fd894334feef7d50a7a2b6930c7a34f" source = "git+https://github.com/pop-os/libcosmic#580db26868a67aba768669fc3762e81a93e0fb85"
dependencies = [ dependencies = [
"quote", "quote",
"syn 1.0.109", "syn 1.0.109",
@ -1842,7 +1842,7 @@ dependencies = [
[[package]] [[package]]
name = "cosmic-theme" name = "cosmic-theme"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/pop-os/libcosmic#ccc1068d9fd894334feef7d50a7a2b6930c7a34f" source = "git+https://github.com/pop-os/libcosmic#580db26868a67aba768669fc3762e81a93e0fb85"
dependencies = [ dependencies = [
"almost", "almost",
"cosmic-config", "cosmic-config",
@ -3215,7 +3215,7 @@ dependencies = [
[[package]] [[package]]
name = "iced" name = "iced"
version = "0.14.0-dev" version = "0.14.0-dev"
source = "git+https://github.com/pop-os/libcosmic#ccc1068d9fd894334feef7d50a7a2b6930c7a34f" source = "git+https://github.com/pop-os/libcosmic#580db26868a67aba768669fc3762e81a93e0fb85"
dependencies = [ dependencies = [
"dnd", "dnd",
"iced_accessibility", "iced_accessibility",
@ -3233,7 +3233,7 @@ dependencies = [
[[package]] [[package]]
name = "iced_accessibility" name = "iced_accessibility"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/pop-os/libcosmic#ccc1068d9fd894334feef7d50a7a2b6930c7a34f" source = "git+https://github.com/pop-os/libcosmic#580db26868a67aba768669fc3762e81a93e0fb85"
dependencies = [ dependencies = [
"accesskit", "accesskit",
"accesskit_winit", "accesskit_winit",
@ -3242,7 +3242,7 @@ dependencies = [
[[package]] [[package]]
name = "iced_core" name = "iced_core"
version = "0.14.0-dev" version = "0.14.0-dev"
source = "git+https://github.com/pop-os/libcosmic#ccc1068d9fd894334feef7d50a7a2b6930c7a34f" source = "git+https://github.com/pop-os/libcosmic#580db26868a67aba768669fc3762e81a93e0fb85"
dependencies = [ dependencies = [
"bitflags 2.8.0", "bitflags 2.8.0",
"bytes", "bytes",
@ -3267,7 +3267,7 @@ dependencies = [
[[package]] [[package]]
name = "iced_futures" name = "iced_futures"
version = "0.14.0-dev" version = "0.14.0-dev"
source = "git+https://github.com/pop-os/libcosmic#ccc1068d9fd894334feef7d50a7a2b6930c7a34f" source = "git+https://github.com/pop-os/libcosmic#580db26868a67aba768669fc3762e81a93e0fb85"
dependencies = [ dependencies = [
"futures", "futures",
"iced_core", "iced_core",
@ -3293,7 +3293,7 @@ dependencies = [
[[package]] [[package]]
name = "iced_graphics" name = "iced_graphics"
version = "0.14.0-dev" version = "0.14.0-dev"
source = "git+https://github.com/pop-os/libcosmic#ccc1068d9fd894334feef7d50a7a2b6930c7a34f" source = "git+https://github.com/pop-os/libcosmic#580db26868a67aba768669fc3762e81a93e0fb85"
dependencies = [ dependencies = [
"bitflags 2.8.0", "bitflags 2.8.0",
"bytemuck", "bytemuck",
@ -3315,7 +3315,7 @@ dependencies = [
[[package]] [[package]]
name = "iced_renderer" name = "iced_renderer"
version = "0.14.0-dev" version = "0.14.0-dev"
source = "git+https://github.com/pop-os/libcosmic#ccc1068d9fd894334feef7d50a7a2b6930c7a34f" source = "git+https://github.com/pop-os/libcosmic#580db26868a67aba768669fc3762e81a93e0fb85"
dependencies = [ dependencies = [
"iced_graphics", "iced_graphics",
"iced_tiny_skia", "iced_tiny_skia",
@ -3327,7 +3327,7 @@ dependencies = [
[[package]] [[package]]
name = "iced_runtime" name = "iced_runtime"
version = "0.14.0-dev" version = "0.14.0-dev"
source = "git+https://github.com/pop-os/libcosmic#ccc1068d9fd894334feef7d50a7a2b6930c7a34f" source = "git+https://github.com/pop-os/libcosmic#580db26868a67aba768669fc3762e81a93e0fb85"
dependencies = [ dependencies = [
"bytes", "bytes",
"cosmic-client-toolkit", "cosmic-client-toolkit",
@ -3343,7 +3343,7 @@ dependencies = [
[[package]] [[package]]
name = "iced_tiny_skia" name = "iced_tiny_skia"
version = "0.14.0-dev" version = "0.14.0-dev"
source = "git+https://github.com/pop-os/libcosmic#ccc1068d9fd894334feef7d50a7a2b6930c7a34f" source = "git+https://github.com/pop-os/libcosmic#580db26868a67aba768669fc3762e81a93e0fb85"
dependencies = [ dependencies = [
"bytemuck", "bytemuck",
"cosmic-text", "cosmic-text",
@ -3359,7 +3359,7 @@ dependencies = [
[[package]] [[package]]
name = "iced_wgpu" name = "iced_wgpu"
version = "0.14.0-dev" version = "0.14.0-dev"
source = "git+https://github.com/pop-os/libcosmic#ccc1068d9fd894334feef7d50a7a2b6930c7a34f" source = "git+https://github.com/pop-os/libcosmic#580db26868a67aba768669fc3762e81a93e0fb85"
dependencies = [ dependencies = [
"as-raw-xcb-connection", "as-raw-xcb-connection",
"bitflags 2.8.0", "bitflags 2.8.0",
@ -3390,7 +3390,7 @@ dependencies = [
[[package]] [[package]]
name = "iced_widget" name = "iced_widget"
version = "0.14.0-dev" version = "0.14.0-dev"
source = "git+https://github.com/pop-os/libcosmic#ccc1068d9fd894334feef7d50a7a2b6930c7a34f" source = "git+https://github.com/pop-os/libcosmic#580db26868a67aba768669fc3762e81a93e0fb85"
dependencies = [ dependencies = [
"cosmic-client-toolkit", "cosmic-client-toolkit",
"dnd", "dnd",
@ -3409,7 +3409,7 @@ dependencies = [
[[package]] [[package]]
name = "iced_winit" name = "iced_winit"
version = "0.14.0-dev" version = "0.14.0-dev"
source = "git+https://github.com/pop-os/libcosmic#ccc1068d9fd894334feef7d50a7a2b6930c7a34f" source = "git+https://github.com/pop-os/libcosmic#580db26868a67aba768669fc3762e81a93e0fb85"
dependencies = [ dependencies = [
"cosmic-client-toolkit", "cosmic-client-toolkit",
"dnd", "dnd",
@ -4414,7 +4414,7 @@ checksum = "b5aba8db14291edd000dfcc4d620c7ebfb122c613afb886ca8803fa4e128a20a"
[[package]] [[package]]
name = "libcosmic" name = "libcosmic"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/pop-os/libcosmic#ccc1068d9fd894334feef7d50a7a2b6930c7a34f" source = "git+https://github.com/pop-os/libcosmic#580db26868a67aba768669fc3762e81a93e0fb85"
dependencies = [ dependencies = [
"apply", "apply",
"ashpd 0.9.2", "ashpd 0.9.2",

10
cosmic-settings/src/pages/desktop/window_management.rs
View file

@ -46,7 +46,7 @@ impl Default for Page {
let focus_follows_cursor = comp_config let focus_follows_cursor = comp_config
.get("focus_follows_cursor") .get("focus_follows_cursor")
.unwrap_or_else(|err| { .unwrap_or_else(|err| {
if !matches!(err, cosmic_config::Error::NoConfigDirectory) { if err.is_err() {
error!(?err, "Failed to read config 'focus_follows_cursor'"); error!(?err, "Failed to read config 'focus_follows_cursor'");
} }
false false
@ -54,7 +54,7 @@ impl Default for Page {
let cursor_follows_focus = comp_config let cursor_follows_focus = comp_config
.get("cursor_follows_focus") .get("cursor_follows_focus")
.unwrap_or_else(|err| { .unwrap_or_else(|err| {
if !matches!(err, cosmic_config::Error::NoConfigDirectory) { if err.is_err() {
error!(?err, "Failed to read config 'cursor_follows_focus'"); error!(?err, "Failed to read config 'cursor_follows_focus'");
} }
false false
@ -63,7 +63,7 @@ impl Default for Page {
let focus_follows_cursor_delay = comp_config let focus_follows_cursor_delay = comp_config
.get("focus_follows_cursor_delay") .get("focus_follows_cursor_delay")
.inspect_err(|err| { .inspect_err(|err| {
if !matches!(err, cosmic_config::Error::NoConfigDirectory) { if err.is_err() {
error!(?err, "Failed to read config 'focus_follows_cursor_delay'") error!(?err, "Failed to read config 'focus_follows_cursor_delay'")
} }
}) })
@ -72,7 +72,7 @@ impl Default for Page {
let show_active_hint = comp_config let show_active_hint = comp_config
.get("active_hint") .get("active_hint")
.inspect_err(|err| { .inspect_err(|err| {
if !matches!(err, cosmic_config::Error::NoConfigDirectory) { if err.is_err() {
error!(?err, "Failed to read config 'active_hint'") error!(?err, "Failed to read config 'active_hint'")
} }
}) })
@ -81,7 +81,7 @@ impl Default for Page {
let edge_snap_threshold = comp_config let edge_snap_threshold = comp_config
.get("edge_snap_threshold") .get("edge_snap_threshold")
.inspect_err(|err| { .inspect_err(|err| {
if !matches!(err, cosmic_config::Error::NoConfigDirectory) { if err.is_err() {
error!(?err, "Failed to read config 'edge_snap_threshold'") error!(?err, "Failed to read config 'edge_snap_threshold'")
} }
}) })

6
cosmic-settings/src/pages/desktop/workspaces.rs
View file

@ -36,7 +36,7 @@ impl Default for Page {
fn default() -> Self { fn default() -> Self {
let comp_config = cosmic_config::Config::new("com.system76.CosmicComp", 1).unwrap(); let comp_config = cosmic_config::Config::new("com.system76.CosmicComp", 1).unwrap();
let comp_workspace_config = comp_config.get("workspaces").unwrap_or_else(|err| { let comp_workspace_config = comp_config.get("workspaces").unwrap_or_else(|err| {
if !matches!(err, cosmic_config::Error::NoConfigDirectory) { if err.is_err() {
error!(?err, "Failed to read config 'workspaces'"); error!(?err, "Failed to read config 'workspaces'");
} }
@ -44,14 +44,14 @@ impl Default for Page {
}); });
let config = cosmic_config::Config::new("com.system76.CosmicWorkspaces", 1).unwrap(); let config = cosmic_config::Config::new("com.system76.CosmicWorkspaces", 1).unwrap();
let show_workspace_name = config.get("show_workspace_name").unwrap_or_else(|err| { let show_workspace_name = config.get("show_workspace_name").unwrap_or_else(|err| {
if !matches!(err, cosmic_config::Error::NoConfigDirectory) { if err.is_err() {
error!(?err, "Failed to read config 'show_workspace_name'"); error!(?err, "Failed to read config 'show_workspace_name'");
} }
false false
}); });
let show_workspace_number = config.get("show_workspace_number").unwrap_or_else(|err| { let show_workspace_number = config.get("show_workspace_number").unwrap_or_else(|err| {
if !matches!(err, cosmic_config::Error::NoConfigDirectory) { if err.is_err() {
error!(?err, "Failed to read config 'show_workspace_number'"); error!(?err, "Failed to read config 'show_workspace_number'");
} }

2
cosmic-settings/src/pages/display/mod.rs
View file

@ -162,7 +162,7 @@ impl Default for Page {
let comp_config = cosmic_config::Config::new("com.system76.CosmicComp", 1).unwrap(); let comp_config = cosmic_config::Config::new("com.system76.CosmicComp", 1).unwrap();
let comp_config_descale_xwayland = let comp_config_descale_xwayland =
comp_config.get("descale_xwayland").unwrap_or_else(|err| { comp_config.get("descale_xwayland").unwrap_or_else(|err| {
if !matches!(err, cosmic_config::Error::NoConfigDirectory) { if err.is_err() {
error!(?err, "Failed to read config 'descale_xwayland'"); error!(?err, "Failed to read config 'descale_xwayland'");
} }

2
cosmic-settings/src/pages/input/mod.rs
View file

@ -46,7 +46,7 @@ fn get_config<T: Default + serde::de::DeserializeOwned>(
key: &str, key: &str,
) -> T { ) -> T {
config.get(key).unwrap_or_else(|why| { config.get(key).unwrap_or_else(|why| {
if !matches!(why, cosmic_config::Error::NoConfigDirectory) { if why.is_err() {
error!(?why, "Failed to read config '{}'", key); error!(?why, "Failed to read config '{}'", key);
} }

2
cosmic-settings/src/pages/input/touchpad.rs
View file

@ -21,7 +21,7 @@ impl Default for Page {
fn default() -> Self { fn default() -> Self {
let comp_config = cosmic_config::Config::new("com.system76.CosmicComp", 1).unwrap(); let comp_config = cosmic_config::Config::new("com.system76.CosmicComp", 1).unwrap();
let comp_workspace_config = comp_config.get("workspaces").unwrap_or_else(|err| { let comp_workspace_config = comp_config.get("workspaces").unwrap_or_else(|err| {
if !matches!(err, cosmic_config::Error::NoConfigDirectory) { if err.is_err() {
error!(?err, "Failed to read config 'workspaces'"); error!(?err, "Failed to read config 'workspaces'");
} }

8
cosmic-settings/src/pages/time/date.rs
View file

@ -56,7 +56,7 @@ impl Default for Page {
let military_time = cosmic_applet_config let military_time = cosmic_applet_config
.get("military_time") .get("military_time")
.unwrap_or_else(|err| { .unwrap_or_else(|err| {
if !matches!(err, cosmic_config::Error::NoConfigDirectory) { if err.is_err() {
error!(?err, "Failed to read config 'military_time'"); error!(?err, "Failed to read config 'military_time'");
} }
@ -66,7 +66,7 @@ impl Default for Page {
let show_seconds = cosmic_applet_config let show_seconds = cosmic_applet_config
.get("show_seconds") .get("show_seconds")
.unwrap_or_else(|err| { .unwrap_or_else(|err| {
if !matches!(err, cosmic_config::Error::NoConfigDirectory) { if err.is_err() {
error!(?err, "Failed to read config 'show_seconds'"); error!(?err, "Failed to read config 'show_seconds'");
} }
@ -76,7 +76,7 @@ impl Default for Page {
let first_day_of_week = cosmic_applet_config let first_day_of_week = cosmic_applet_config
.get("first_day_of_week") .get("first_day_of_week")
.unwrap_or_else(|err| { .unwrap_or_else(|err| {
if !matches!(err, cosmic_config::Error::NoConfigDirectory) { if err.is_err() {
error!(?err, "Failed to read config 'first_day_of_week'"); error!(?err, "Failed to read config 'first_day_of_week'");
} }
@ -86,7 +86,7 @@ impl Default for Page {
let show_date_in_top_panel = cosmic_applet_config let show_date_in_top_panel = cosmic_applet_config
.get("show_date_in_top_panel") .get("show_date_in_top_panel")
.unwrap_or_else(|err| { .unwrap_or_else(|err| {
if !matches!(err, cosmic_config::Error::NoConfigDirectory) { if err.is_err() {
error!(?err, "Failed to read config 'show_date_in_top_panel'"); error!(?err, "Failed to read config 'show_date_in_top_panel'");
} }