From ba0fec15e0fc93075e003c16dfe5c0dddbba7b7e Mon Sep 17 00:00:00 2001 From: Ashley Wulber Date: Thu, 14 Nov 2024 11:19:05 -0500 Subject: [PATCH] fix: update libcosmic with is_daemon --- Cargo.lock | 32 ++++++++++++++++---------------- cosmic-settings/src/app.rs | 3 ++- 2 files changed, 18 insertions(+), 17 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index cfc881d9..62d7f077 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1471,7 +1471,7 @@ dependencies = [ [[package]] name = "cosmic-config" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic#01bd999d281cef270742391fdd5f5addf0bc16f1" +source = "git+https://github.com/pop-os/libcosmic#aaadf7199ebed8a5a04ebed559f62455d622689e" dependencies = [ "atomicwrites", "cosmic-config-derive", @@ -1493,7 +1493,7 @@ dependencies = [ [[package]] name = "cosmic-config-derive" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic#01bd999d281cef270742391fdd5f5addf0bc16f1" +source = "git+https://github.com/pop-os/libcosmic#aaadf7199ebed8a5a04ebed559f62455d622689e" dependencies = [ "quote", "syn 1.0.109", @@ -1764,7 +1764,7 @@ dependencies = [ [[package]] name = "cosmic-theme" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic#01bd999d281cef270742391fdd5f5addf0bc16f1" +source = "git+https://github.com/pop-os/libcosmic#aaadf7199ebed8a5a04ebed559f62455d622689e" dependencies = [ "almost", "cosmic-config", @@ -3149,7 +3149,7 @@ dependencies = [ [[package]] name = "iced" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic#01bd999d281cef270742391fdd5f5addf0bc16f1" +source = "git+https://github.com/pop-os/libcosmic#aaadf7199ebed8a5a04ebed559f62455d622689e" dependencies = [ "dnd", "iced_accessibility", @@ -3167,7 +3167,7 @@ dependencies = [ [[package]] name = "iced_accessibility" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic#01bd999d281cef270742391fdd5f5addf0bc16f1" +source = "git+https://github.com/pop-os/libcosmic#aaadf7199ebed8a5a04ebed559f62455d622689e" dependencies = [ "accesskit", "accesskit_winit", @@ -3176,7 +3176,7 @@ dependencies = [ [[package]] name = "iced_core" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic#01bd999d281cef270742391fdd5f5addf0bc16f1" +source = "git+https://github.com/pop-os/libcosmic#aaadf7199ebed8a5a04ebed559f62455d622689e" dependencies = [ "bitflags 2.6.0", "bytes", @@ -3201,7 +3201,7 @@ dependencies = [ [[package]] name = "iced_futures" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic#01bd999d281cef270742391fdd5f5addf0bc16f1" +source = "git+https://github.com/pop-os/libcosmic#aaadf7199ebed8a5a04ebed559f62455d622689e" dependencies = [ "futures", "iced_core", @@ -3227,7 +3227,7 @@ dependencies = [ [[package]] name = "iced_graphics" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic#01bd999d281cef270742391fdd5f5addf0bc16f1" +source = "git+https://github.com/pop-os/libcosmic#aaadf7199ebed8a5a04ebed559f62455d622689e" dependencies = [ "bitflags 2.6.0", "bytemuck", @@ -3249,7 +3249,7 @@ dependencies = [ [[package]] name = "iced_renderer" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic#01bd999d281cef270742391fdd5f5addf0bc16f1" +source = "git+https://github.com/pop-os/libcosmic#aaadf7199ebed8a5a04ebed559f62455d622689e" dependencies = [ "iced_graphics", "iced_tiny_skia", @@ -3261,7 +3261,7 @@ dependencies = [ [[package]] name = "iced_runtime" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic#01bd999d281cef270742391fdd5f5addf0bc16f1" +source = "git+https://github.com/pop-os/libcosmic#aaadf7199ebed8a5a04ebed559f62455d622689e" dependencies = [ "bytes", "dnd", @@ -3277,7 +3277,7 @@ dependencies = [ [[package]] name = "iced_tiny_skia" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic#01bd999d281cef270742391fdd5f5addf0bc16f1" +source = "git+https://github.com/pop-os/libcosmic#aaadf7199ebed8a5a04ebed559f62455d622689e" dependencies = [ "bytemuck", "cosmic-text", @@ -3293,7 +3293,7 @@ dependencies = [ [[package]] name = "iced_wgpu" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic#01bd999d281cef270742391fdd5f5addf0bc16f1" +source = "git+https://github.com/pop-os/libcosmic#aaadf7199ebed8a5a04ebed559f62455d622689e" dependencies = [ "as-raw-xcb-connection", "bitflags 2.6.0", @@ -3324,7 +3324,7 @@ dependencies = [ [[package]] name = "iced_widget" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic#01bd999d281cef270742391fdd5f5addf0bc16f1" +source = "git+https://github.com/pop-os/libcosmic#aaadf7199ebed8a5a04ebed559f62455d622689e" dependencies = [ "dnd", "iced_accessibility", @@ -3343,7 +3343,7 @@ dependencies = [ [[package]] name = "iced_winit" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic#01bd999d281cef270742391fdd5f5addf0bc16f1" +source = "git+https://github.com/pop-os/libcosmic#aaadf7199ebed8a5a04ebed559f62455d622689e" dependencies = [ "dnd", "iced_accessibility", @@ -4326,7 +4326,7 @@ checksum = "18d287de67fe55fd7e1581fe933d965a5a9477b38e949cfa9f8574ef01506398" [[package]] name = "libcosmic" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic#01bd999d281cef270742391fdd5f5addf0bc16f1" +source = "git+https://github.com/pop-os/libcosmic#aaadf7199ebed8a5a04ebed559f62455d622689e" dependencies = [ "apply", "ashpd 0.9.2", @@ -7960,7 +7960,7 @@ version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" dependencies = [ - "windows-sys 0.59.0", + "windows-sys 0.48.0", ] [[package]] diff --git a/cosmic-settings/src/app.rs b/cosmic-settings/src/app.rs index d864ddc5..6e9a5246 100644 --- a/cosmic-settings/src/app.rs +++ b/cosmic-settings/src/app.rs @@ -50,6 +50,7 @@ use desktop::{ use event::wayland; use page::Entity; use std::collections::BTreeSet; +use std::time::Duration; use std::{borrow::Cow, str::FromStr}; #[allow(clippy::struct_excessive_bools)] @@ -781,7 +782,7 @@ impl cosmic::Application for SettingsApp { fn on_close_requested(&self, id: window::Id) -> Option { if id == self.core.main_window_id().unwrap() { std::thread::spawn(|| { - std::thread::sleep(tokio::time::Duration::from_millis(100)); + std::thread::sleep(Duration::from_millis(100)); std::process::exit(0); }); }