From b0c05a344be91adb6e585694bc117528dfe22cff Mon Sep 17 00:00:00 2001
From: Ashley Wulber <ashley@system76.com>
Date: Thu, 18 Jan 2024 18:16:37 -0500
Subject: [PATCH 1/5] fix: logging and use dbus config subscription in audio
 applet

---
 Cargo.lock                                    | 126 +++---------------
 Cargo.toml                                    |   2 +
 cosmic-app-list/Cargo.toml                    |   3 +-
 cosmic-app-list/src/main.rs                   |   3 +-
 cosmic-applet-audio/Cargo.toml                |  10 +-
 cosmic-applet-audio/src/main.rs               |   8 +-
 cosmic-applet-battery/Cargo.toml              |   3 +-
 cosmic-applet-battery/src/main.rs             |   3 +-
 cosmic-applet-bluetooth/Cargo.toml            |   3 +-
 cosmic-applet-bluetooth/src/main.rs           |   3 +-
 cosmic-applet-network/Cargo.toml              |   3 +-
 cosmic-applet-network/src/main.rs             |   3 +-
 cosmic-applet-notifications/Cargo.toml        |   3 +-
 cosmic-applet-notifications/src/main.rs       |   1 +
 cosmic-applet-workspaces/Cargo.toml           |   5 +-
 .../src/components/app.rs                     |   2 -
 cosmic-applet-workspaces/src/config.rs        |   2 -
 cosmic-applet-workspaces/src/main.rs          |  15 ++-
 debian/control                                |   2 +-
 rust-toolchain.toml                           |   2 +-
 20 files changed, 63 insertions(+), 139 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 1770fcdc..6efd396c 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -410,17 +410,6 @@ dependencies = [
  "syn 1.0.109",
 ]
 
-[[package]]
-name = "atty"
-version = "0.2.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
-dependencies = [
- "hermit-abi 0.1.19",
- "libc",
- "winapi",
-]
-
 [[package]]
 name = "autocfg"
 version = "1.1.0"
@@ -772,7 +761,6 @@ dependencies = [
  "log",
  "nix 0.26.4",
  "once_cell",
- "pretty_env_logger 0.5.0",
  "rand",
  "ron",
  "rust-embed 6.8.1",
@@ -780,28 +768,30 @@ dependencies = [
  "serde",
  "shlex",
  "tokio",
+ "tracing-log",
+ "tracing-subscriber",
  "url",
  "xdg",
 ]
 
 [[package]]
 name = "cosmic-applet-audio"
-version = "0.1.0"
+version = "0.1.1"
 dependencies = [
  "cosmic-time",
  "i18n-embed 0.13.9",
  "i18n-embed-fl 0.6.7",
- "icon-loader",
  "libcosmic",
  "libpulse-binding",
  "libpulse-glib-binding",
  "mpris2-zbus",
- "pretty_env_logger 0.4.0",
  "rust-embed 6.8.1",
  "rust-embed-utils 7.8.1",
  "serde",
  "tokio",
  "tracing",
+ "tracing-log",
+ "tracing-subscriber",
  "url",
  "zbus",
 ]
@@ -817,10 +807,11 @@ dependencies = [
  "libcosmic",
  "log",
  "once_cell",
- "pretty_env_logger 0.5.0",
  "rust-embed 6.8.1",
  "tokio",
  "tracing",
+ "tracing-log",
+ "tracing-subscriber",
  "zbus",
 ]
 
@@ -839,11 +830,12 @@ dependencies = [
  "libcosmic",
  "log",
  "once_cell",
- "pretty_env_logger 0.5.0",
  "rand",
  "rust-embed 6.8.1",
  "slotmap",
  "tokio",
+ "tracing-log",
+ "tracing-subscriber",
 ]
 
 [[package]]
@@ -873,11 +865,12 @@ dependencies = [
  "itertools 0.10.5",
  "libcosmic",
  "log",
- "pretty_env_logger 0.5.0",
  "rust-embed 6.8.1",
  "rust-embed-utils 7.8.1",
  "slotmap",
  "tokio",
+ "tracing-log",
+ "tracing-subscriber",
  "zbus",
 ]
 
@@ -900,6 +893,7 @@ dependencies = [
  "sendfd",
  "tokio",
  "tracing",
+ "tracing-log",
  "tracing-subscriber",
  "url",
  "zbus",
@@ -965,7 +959,7 @@ dependencies = [
 
 [[package]]
 name = "cosmic-applet-workspaces"
-version = "0.1.0"
+version = "0.1.1"
 dependencies = [
  "anyhow",
  "cosmic-client-toolkit",
@@ -977,8 +971,9 @@ dependencies = [
  "log",
  "nix 0.26.4",
  "once_cell",
- "pretty_env_logger 0.5.0",
  "rust-embed 6.8.1",
+ "tracing-log",
+ "tracing-subscriber",
  "xdg",
 ]
 
@@ -1633,32 +1628,6 @@ dependencies = [
  "syn 2.0.40",
 ]
 
-[[package]]
-name = "env_logger"
-version = "0.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44533bbbb3bb3c1fa17d9f2e4e38bbbaf8396ba82193c4cb1b6445d711445d36"
-dependencies = [
- "atty",
- "humantime 1.3.0",
- "log",
- "regex",
- "termcolor",
-]
-
-[[package]]
-name = "env_logger"
-version = "0.10.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95b3f3e67048839cb0d0781f445682a35113da7121f7c949db0e2be96a4fbece"
-dependencies = [
- "humantime 2.1.0",
- "is-terminal",
- "log",
- "regex",
- "termcolor",
-]
-
 [[package]]
 name = "equivalent"
 version = "1.0.1"
@@ -2425,15 +2394,6 @@ version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
 
-[[package]]
-name = "hermit-abi"
-version = "0.1.19"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33"
-dependencies = [
- "libc",
-]
-
 [[package]]
 name = "hermit-abi"
 version = "0.3.3"
@@ -2452,21 +2412,6 @@ version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dfa686283ad6dd069f105e5ab091b04c62850d3e4cf5d67debad1933f55023df"
 
-[[package]]
-name = "humantime"
-version = "1.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df004cfca50ef23c36850aaaa59ad52cc70d0e90243c3c7737a4dd32dc7a3c4f"
-dependencies = [
- "quick-error",
-]
-
-[[package]]
-name = "humantime"
-version = "2.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
-
 [[package]]
 name = "i18n-config"
 version = "0.4.6"
@@ -2909,7 +2854,7 @@ version = "1.0.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2"
 dependencies = [
- "hermit-abi 0.3.3",
+ "hermit-abi",
  "libc",
  "windows-sys 0.48.0",
 ]
@@ -2920,17 +2865,6 @@ version = "2.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5a611371471e98973dbcab4e0ec66c31a10bc356eeb4d54a0e05eac8158fe38c"
 
-[[package]]
-name = "is-terminal"
-version = "0.4.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b"
-dependencies = [
- "hermit-abi 0.3.3",
- "rustix 0.38.28",
- "windows-sys 0.48.0",
-]
-
 [[package]]
 name = "itertools"
 version = "0.10.5"
@@ -3611,7 +3545,7 @@ version = "1.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43"
 dependencies = [
- "hermit-abi 0.3.3",
+ "hermit-abi",
  "libc",
 ]
 
@@ -3973,26 +3907,6 @@ version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e8cf8e6a8aa66ce33f63993ffc4ea4271eb5b0530a9002db8455ea6050c77bfa"
 
-[[package]]
-name = "pretty_env_logger"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "926d36b9553851b8b0005f1275891b392ee4d2d833852c417ed025477350fb9d"
-dependencies = [
- "env_logger 0.7.1",
- "log",
-]
-
-[[package]]
-name = "pretty_env_logger"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "865724d4dbe39d9f3dd3b52b88d859d66bcb2d6a0acfd5ea68a65fb66d4bdc1c"
-dependencies = [
- "env_logger 0.10.1",
- "log",
-]
-
 [[package]]
 name = "proc-macro-crate"
 version = "1.3.1"
@@ -4083,12 +3997,6 @@ dependencies = [
  "bytemuck",
 ]
 
-[[package]]
-name = "quick-error"
-version = "1.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0"
-
 [[package]]
 name = "quick-xml"
 version = "0.28.2"
diff --git a/Cargo.toml b/Cargo.toml
index 01acf11c..daa7c4db 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -37,6 +37,8 @@ libcosmic = { git = "https://github.com/pop-os/libcosmic", default-features = fa
 ] }
 zbus = { version = "3.14", default-features = false, features = ["tokio"] }
 tracing = "0.1"
+tracing-subscriber = "0.3.18"
+tracing-log = "0.2.0"
 
 [profile.release]
 lto = "thin"
diff --git a/cosmic-app-list/Cargo.toml b/cosmic-app-list/Cargo.toml
index 9dc3d0bd..764b9026 100644
--- a/cosmic-app-list/Cargo.toml
+++ b/cosmic-app-list/Cargo.toml
@@ -14,7 +14,8 @@ futures = "0.3"
 futures-util = "0.3"
 once_cell = "1.9"
 xdg = "2.4"
-pretty_env_logger = "0.5"
+tracing-subscriber.workspace = true
+tracing-log.workspace = true
 nix = "0.26"
 shlex = "1.1.0"
 anyhow = "1.0"
diff --git a/cosmic-app-list/src/main.rs b/cosmic-app-list/src/main.rs
index ab85a26d..e46afc57 100644
--- a/cosmic-app-list/src/main.rs
+++ b/cosmic-app-list/src/main.rs
@@ -14,7 +14,8 @@ use crate::config::{APP_ID, VERSION};
 
 fn main() -> cosmic::iced::Result {
     // Initialize logger
-    pretty_env_logger::init();
+    tracing_subscriber::fmt::init();
+    let _ = tracing_log::LogTracer::init();
     info!("Iced Workspaces Applet ({})", APP_ID);
     info!("Version: {}", VERSION);
     // Prepare i18n
diff --git a/cosmic-applet-audio/Cargo.toml b/cosmic-applet-audio/Cargo.toml
index 56488da8..2c854d65 100644
--- a/cosmic-applet-audio/Cargo.toml
+++ b/cosmic-applet-audio/Cargo.toml
@@ -1,19 +1,19 @@
 [package]
 name = "cosmic-applet-audio"
-version = "0.1.0"
+version = "0.1.1"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-icon-loader = { version = "0.3.6", features = ["gtk"] }
-libpulse-binding = "2.26.0"
-libpulse-glib-binding = "2.25.0"
+libpulse-binding = "2.28.1"
+libpulse-glib-binding = "2.28.1"
 tokio = { version = "1.20.1", features=["full"] }
 libcosmic.workspace = true
 cosmic-time.workspace = true
 tracing = "0.1.40"
-pretty_env_logger = "0.4.0"
+tracing-subscriber.workspace = true
+tracing-log.workspace = true
 # Application i18n
 i18n-embed = { version = "0.13", features = ["fluent-system", "desktop-requester"] }
 i18n-embed-fl = "0.6"
diff --git a/cosmic-applet-audio/src/main.rs b/cosmic-applet-audio/src/main.rs
index 4d5943b8..b45cac69 100644
--- a/cosmic-applet-audio/src/main.rs
+++ b/cosmic-applet-audio/src/main.rs
@@ -40,12 +40,18 @@ use mpris_subscription::MprisUpdate;
 mod config;
 mod mpris_subscription;
 mod pulse;
+
+const VERSION: &str = env!("CARGO_PKG_VERSION");
+
 pub fn main() -> cosmic::iced::Result {
-    pretty_env_logger::init();
+    tracing_subscriber::fmt::init();
+    let _ = tracing_log::LogTracer::init();
 
     // Prepare i18n
     localize();
 
+    tracing::info!("Starting audio applet with version {VERSION}");
+
     cosmic::applet::run::<Audio>(true, ())
 }
 
diff --git a/cosmic-applet-battery/Cargo.toml b/cosmic-applet-battery/Cargo.toml
index 0b58d11b..b386d470 100644
--- a/cosmic-applet-battery/Cargo.toml
+++ b/cosmic-applet-battery/Cargo.toml
@@ -11,7 +11,8 @@ tracing.workspace = true
 futures = "0.3"
 zbus.workspace = true
 log = "0.4"
-pretty_env_logger = "0.5"
+tracing-subscriber.workspace = true
+tracing-log.workspace = true
 # Application i18n
 i18n-embed = { version = "0.13.4", features = ["fluent-system", "desktop-requester"] }
 i18n-embed-fl = "0.6.4"
diff --git a/cosmic-applet-battery/src/main.rs b/cosmic-applet-battery/src/main.rs
index 98a8f9ca..25e3ad04 100644
--- a/cosmic-applet-battery/src/main.rs
+++ b/cosmic-applet-battery/src/main.rs
@@ -17,7 +17,8 @@ use crate::config::{PROFILE, VERSION};
 
 fn main() -> cosmic::iced::Result {
     // Initialize logger
-    pretty_env_logger::init();
+    tracing_subscriber::fmt::init();
+    let _ = tracing_log::LogTracer::init();
     info!("Iced Workspaces Applet ({})", APP_ID);
     info!("Version: {} ({})", VERSION, PROFILE);
 
diff --git a/cosmic-applet-bluetooth/Cargo.toml b/cosmic-applet-bluetooth/Cargo.toml
index 544bc221..a8f4fcb4 100644
--- a/cosmic-applet-bluetooth/Cargo.toml
+++ b/cosmic-applet-bluetooth/Cargo.toml
@@ -12,7 +12,8 @@ libcosmic.workspace = true
 cosmic-time.workspace = true
 futures = "0.3"
 log = "0.4"
-pretty_env_logger = "0.5"
+tracing-subscriber.workspace = true
+tracing-log.workspace = true
 itertools = "0.10.3"
 slotmap = "1.0.6"
 tokio = { version = "1.15.0", features = ["full"] }
diff --git a/cosmic-applet-bluetooth/src/main.rs b/cosmic-applet-bluetooth/src/main.rs
index 408bcbec..60211b20 100644
--- a/cosmic-applet-bluetooth/src/main.rs
+++ b/cosmic-applet-bluetooth/src/main.rs
@@ -12,7 +12,8 @@ use crate::localize::localize;
 
 fn main() -> cosmic::iced::Result {
     // Initialize logger
-    pretty_env_logger::init();
+    tracing_subscriber::fmt::init();
+    let _ = tracing_log::LogTracer::init();
     info!("Iced Workspaces Applet ({})", APP_ID);
     info!("Version: {} ({})", VERSION, PROFILE);
 
diff --git a/cosmic-applet-network/Cargo.toml b/cosmic-applet-network/Cargo.toml
index ee1545a0..3378556f 100644
--- a/cosmic-applet-network/Cargo.toml
+++ b/cosmic-applet-network/Cargo.toml
@@ -13,7 +13,8 @@ cosmic-time.workspace = true
 futures = "0.3"
 zbus.workspace = true
 log = "0.4"
-pretty_env_logger = "0.5"
+tracing-subscriber.workspace = true
+tracing-log.workspace = true
 itertools = "0.10.3"
 slotmap = "1.0.6"
 tokio = { version = "1.15.0", features = ["full"] }
diff --git a/cosmic-applet-network/src/main.rs b/cosmic-applet-network/src/main.rs
index b08a9466..3cf93b54 100644
--- a/cosmic-applet-network/src/main.rs
+++ b/cosmic-applet-network/src/main.rs
@@ -12,7 +12,8 @@ use crate::localize::localize;
 
 fn main() -> cosmic::iced::Result {
     // Initialize logger
-    pretty_env_logger::init();
+    tracing_subscriber::fmt::init();
+    let _ = tracing_log::LogTracer::init();
     info!("Iced Workspaces Applet ({})", APP_ID);
     info!("Version: {} ({})", VERSION, PROFILE);
 
diff --git a/cosmic-applet-notifications/Cargo.toml b/cosmic-applet-notifications/Cargo.toml
index e722d47b..3c629b3e 100644
--- a/cosmic-applet-notifications/Cargo.toml
+++ b/cosmic-applet-notifications/Cargo.toml
@@ -26,7 +26,8 @@ tracing = "0.1"
 ron = "0.8"
 sendfd = { version = "0.4", features = ["tokio"] }
 bytemuck = "1"
-tracing-subscriber = "0.3"
+tracing-subscriber.workspace = true
+tracing-log.workspace = true
 zbus.workspace = true
 # Application i18n
 i18n-embed = { version = "0.13.4", features = [
diff --git a/cosmic-applet-notifications/src/main.rs b/cosmic-applet-notifications/src/main.rs
index 2dafbc52..32a90412 100644
--- a/cosmic-applet-notifications/src/main.rs
+++ b/cosmic-applet-notifications/src/main.rs
@@ -32,6 +32,7 @@ use tracing::info;
 #[tokio::main(flavor = "current_thread")]
 pub async fn main() -> cosmic::iced::Result {
     tracing_subscriber::fmt::init();
+    let _ = tracing_log::LogTracer::init();
     // Prepare i18n
     localize::localize();
 
diff --git a/cosmic-applet-workspaces/Cargo.toml b/cosmic-applet-workspaces/Cargo.toml
index 6b61b3fc..ea2c5823 100644
--- a/cosmic-applet-workspaces/Cargo.toml
+++ b/cosmic-applet-workspaces/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "cosmic-applet-workspaces"
-version = "0.1.0"
+version = "0.1.1"
 authors = ["Ashley Wulber <ashley@system76.com>"]
 edition = "2021"
 
@@ -10,7 +10,8 @@ cctk.workspace = true
 cosmic-protocols.workspace = true
 nix = "0.26.1"
 log = "0.4"
-pretty_env_logger = "0.5"
+tracing-subscriber.workspace = true
+tracing-log.workspace = true
 once_cell = "1.9"
 futures = "0.3.21"
 xdg = "2.4.0"
diff --git a/cosmic-applet-workspaces/src/components/app.rs b/cosmic-applet-workspaces/src/components/app.rs
index 94f892e2..2f440638 100644
--- a/cosmic-applet-workspaces/src/components/app.rs
+++ b/cosmic-applet-workspaces/src/components/app.rs
@@ -38,7 +38,6 @@ enum Message {
     WorkspaceUpdate(WorkspacesUpdate),
     WorkspacePressed(ObjectId),
     WheelScrolled(ScrollDelta),
-    Errored,
 }
 
 impl cosmic::Application for IcedWorkspacesApplet {
@@ -114,7 +113,6 @@ impl cosmic::Application for IcedWorkspacesApplet {
                     let _ = tx.try_send(WorkspaceEvent::Scroll(delta));
                 }
             }
-            Message::Errored => {}
         }
         Command::none()
     }
diff --git a/cosmic-applet-workspaces/src/config.rs b/cosmic-applet-workspaces/src/config.rs
index cdf393ab..ac2bb33b 100644
--- a/cosmic-applet-workspaces/src/config.rs
+++ b/cosmic-applet-workspaces/src/config.rs
@@ -1,3 +1 @@
 pub const APP_ID: &str = "com.system76.CosmicWorkspacesApplet";
-pub const PROFILE: &str = "";
-pub const VERSION: &str = "0.1.0";
diff --git a/cosmic-applet-workspaces/src/main.rs b/cosmic-applet-workspaces/src/main.rs
index f213b14c..aecc6969 100644
--- a/cosmic-applet-workspaces/src/main.rs
+++ b/cosmic-applet-workspaces/src/main.rs
@@ -10,16 +10,17 @@ use log::info;
 
 use localize::localize;
 
-use crate::{
-    components::app,
-    config::{PROFILE, VERSION},
-};
+use crate::components::app;
+
+const VERSION: &str = env!("CARGO_PKG_VERSION");
 
 fn main() -> cosmic::iced::Result {
     // Initialize logger
-    pretty_env_logger::init();
-    info!("Iced Workspaces Applet ({})", APP_ID);
-    info!("Version: {} ({})", VERSION, PROFILE);
+    tracing_subscriber::fmt::init();
+    let _ = tracing_log::LogTracer::init();
+
+    info!("Starting audio applet with version {VERSION}");
+    info!("Iced Workspaces Applet ({VERSION})");
 
     // Prepare i18n
     localize();
diff --git a/debian/control b/debian/control
index 04f944dc..d705c224 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: system76 <info@system76.com>
 Build-Depends:
   debhelper (>= 11),
   debhelper-compat (= 11),
-  rustc (>=1.65),
+  rustc (=1.73.0),
   cargo,
   libdbus-1-dev,
   libegl-dev,
diff --git a/rust-toolchain.toml b/rust-toolchain.toml
index a438b163..22fb8b20 100644
--- a/rust-toolchain.toml
+++ b/rust-toolchain.toml
@@ -1,2 +1,2 @@
 [toolchain]
-channel = "1.74.0"
\ No newline at end of file
+channel = "1.73"
\ No newline at end of file

From 4842e3f6354db48fd41ba5335e103e076b0cbd0a Mon Sep 17 00:00:00 2001
From: Ashley Wulber <ashley@system76.com>
Date: Thu, 18 Jan 2024 18:18:27 -0500
Subject: [PATCH 2/5] chore: use dbus config subscription for app list

---
 Cargo.lock                           | 615 +++++++++++++--------------
 Cargo.toml                           |  10 +-
 cosmic-app-list/src/app.rs           |  13 +-
 cosmic-applet-audio/src/main.rs      |  19 +-
 cosmic-applet-audio/src/pulse.rs     |  12 +-
 cosmic-applet-workspaces/Cargo.toml  |   4 +-
 cosmic-applet-workspaces/src/main.rs |   3 +-
 debian/control                       |   2 +-
 rust-toolchain.toml                  |   2 +-
 9 files changed, 327 insertions(+), 353 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 6efd396c..35cc8eda 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -58,9 +58,9 @@ dependencies = [
 
 [[package]]
 name = "ahash"
-version = "0.8.6"
+version = "0.8.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "91429305e9f0a25f6205c5b8e0d2db09e0708a7a6df0f42212bb56c32c8ac97a"
+checksum = "77c3a9648d43b9cd48db467b3f87fdd6e146bcc88ab0180006cef2179fe11d01"
 dependencies = [
  "cfg-if",
  "once_cell",
@@ -112,9 +112,9 @@ dependencies = [
 
 [[package]]
 name = "anyhow"
-version = "1.0.75"
+version = "1.0.79"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6"
+checksum = "080e9890a082662b09c1ad45f567faeeb47f22b5fb23895fbe1e651e718e25ca"
 
 [[package]]
 name = "apply"
@@ -151,9 +151,9 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
 
 [[package]]
 name = "as-raw-xcb-connection"
-version = "1.0.0"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2d5f312b0a56c5cdf967c0aeb67f6289603354951683bc97ddc595ab974ba9aa"
+checksum = "175571dd1d178ced59193a6fc02dde1b972eb0bc56c892cde9beeceac5bf0f6b"
 
 [[package]]
 name = "ash"
@@ -166,9 +166,9 @@ dependencies = [
 
 [[package]]
 name = "ashpd"
-version = "0.6.7"
+version = "0.6.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2c018490e423efb6f032ef575f873ea57b61d44bec763cfe027b8e8852a027cf"
+checksum = "4ac22eda5891cc086690cb6fa10121c0390de0e3b04eb269f2d766b00d3f2d81"
 dependencies = [
  "enumflags2",
  "futures-channel",
@@ -213,7 +213,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1ca33f4bc4ed1babef42cad36cc1f51fa88be00420404e5b1e80ab1b18f7678c"
 dependencies = [
  "concurrent-queue",
- "event-listener 4.0.0",
+ "event-listener 4.0.3",
  "event-listener-strategy",
  "futures-core",
  "pin-project-lite",
@@ -225,11 +225,11 @@ version = "1.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "17ae5ebefcc48e7452b4987947920dac9450be1110cadf34d1b8c116bdbaf97c"
 dependencies = [
- "async-lock 3.2.0",
+ "async-lock 3.3.0",
  "async-task",
  "concurrent-queue",
  "fastrand 2.0.1",
- "futures-lite 2.1.0",
+ "futures-lite 2.2.0",
  "slab",
 ]
 
@@ -267,18 +267,18 @@ dependencies = [
 
 [[package]]
 name = "async-io"
-version = "2.2.2"
+version = "2.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6afaa937395a620e33dc6a742c593c01aced20aa376ffb0f628121198578ccc7"
+checksum = "fb41eb19024a91746eba0773aa5e16036045bbf45733766661099e182ea6a744"
 dependencies = [
- "async-lock 3.2.0",
+ "async-lock 3.3.0",
  "cfg-if",
  "concurrent-queue",
  "futures-io",
- "futures-lite 2.1.0",
+ "futures-lite 2.2.0",
  "parking",
- "polling 3.3.1",
- "rustix 0.38.28",
+ "polling 3.3.2",
+ "rustix 0.38.30",
  "slab",
  "tracing",
  "windows-sys 0.52.0",
@@ -295,11 +295,11 @@ dependencies = [
 
 [[package]]
 name = "async-lock"
-version = "3.2.0"
+version = "3.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7125e42787d53db9dd54261812ef17e937c95a51e4d291373b670342fa44310c"
+checksum = "d034b430882f8381900d3fe6f0aaa3ad94f2cb4ac519b429692a1bc2dda4ae7b"
 dependencies = [
- "event-listener 4.0.0",
+ "event-listener 4.0.3",
  "event-listener-strategy",
  "pin-project-lite",
 ]
@@ -317,7 +317,7 @@ dependencies = [
  "cfg-if",
  "event-listener 3.1.0",
  "futures-lite 1.13.0",
- "rustix 0.38.28",
+ "rustix 0.38.30",
  "windows-sys 0.48.0",
 ]
 
@@ -329,7 +329,7 @@ checksum = "5fd55a5ba1179988837d24ab4c7cc8ed6efdeff578ede0416b4225a5fca35bd0"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.40",
+ "syn 2.0.48",
 ]
 
 [[package]]
@@ -338,13 +338,13 @@ version = "0.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9e47d90f65a225c4527103a8d747001fc56e375203592b25ad103e1ca13124c5"
 dependencies = [
- "async-io 2.2.2",
+ "async-io 2.3.0",
  "async-lock 2.8.0",
  "atomic-waker",
  "cfg-if",
  "futures-core",
  "futures-io",
- "rustix 0.38.28",
+ "rustix 0.38.30",
  "signal-hook-registry",
  "slab",
  "windows-sys 0.48.0",
@@ -352,19 +352,19 @@ dependencies = [
 
 [[package]]
 name = "async-task"
-version = "4.5.0"
+version = "4.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b4eb2cdb97421e01129ccb49169d8279ed21e829929144f4a22a6e54ac549ca1"
+checksum = "fbb36e985947064623dbd357f727af08ffd077f93d696782f3c56365fa2e2799"
 
 [[package]]
 name = "async-trait"
-version = "0.1.74"
+version = "0.1.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a66537f1bb974b254c98ed142ff995236e81b9d0fe4db0575f46612cb15eb0f9"
+checksum = "c980ee35e870bd1a4d2c8294d4c04d0499e67bca1e4b5cefcc693c2fa00caea9"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.40",
+ "syn 2.0.48",
 ]
 
 [[package]]
@@ -378,7 +378,7 @@ name = "atomicwrites"
 version = "0.4.2"
 source = "git+https://github.com/jackpot51/rust-atomicwrites#043ab4859d53ffd3d55334685303d8df39c9f768"
 dependencies = [
- "rustix 0.38.28",
+ "rustix 0.38.30",
  "tempfile",
  "windows-sys 0.48.0",
 ]
@@ -433,9 +433,9 @@ dependencies = [
 
 [[package]]
 name = "base64"
-version = "0.21.5"
+version = "0.21.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "35636a1494ede3b646cc98f74f8e62c773a38a659ebc777a2cf26b9b74171df9"
+checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567"
 
 [[package]]
 name = "bit-set"
@@ -466,9 +466,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
 [[package]]
 name = "bitflags"
-version = "2.4.1"
+version = "2.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07"
+checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf"
 dependencies = [
  "serde",
 ]
@@ -495,11 +495,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6a37913e8dc4ddcc604f0c6d3bf2887c995153af3611de9e23c352b44c1b9118"
 dependencies = [
  "async-channel 2.1.1",
- "async-lock 3.2.0",
+ "async-lock 3.3.0",
  "async-task",
  "fastrand 2.0.1",
  "futures-io",
- "futures-lite 2.1.0",
+ "futures-lite 2.2.0",
  "piper",
  "tracing",
 ]
@@ -556,7 +556,7 @@ checksum = "965ab7eb5f8f97d2a083c799f3a1b994fc397b2fe2da5d1da1626ce15a39f2b1"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.40",
+ "syn 2.0.48",
 ]
 
 [[package]]
@@ -573,14 +573,14 @@ checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223"
 
 [[package]]
 name = "calloop"
-version = "0.12.3"
+version = "0.12.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b50b5a44d59a98c55a9eeb518f39bf7499ba19fd98ee7d22618687f3f10adbf"
+checksum = "fba7adb4dd5aa98e5553510223000e7148f621165ec5f9acd7113f6ca4995298"
 dependencies = [
- "bitflags 2.4.1",
+ "bitflags 2.4.2",
  "log",
- "polling 3.3.1",
- "rustix 0.38.28",
+ "polling 3.3.2",
+ "rustix 0.38.30",
  "slab",
  "thiserror",
 ]
@@ -592,7 +592,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0f0ea9b9476c7fad82841a8dbb380e2eae480c21910feba80725b46931ed8f02"
 dependencies = [
  "calloop",
- "rustix 0.38.28",
+ "rustix 0.38.30",
  "wayland-backend 0.3.2",
  "wayland-client 0.31.1",
 ]
@@ -608,9 +608,9 @@ dependencies = [
 
 [[package]]
 name = "cfg-expr"
-version = "0.15.5"
+version = "0.15.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03915af431787e6ffdcc74c645077518c6b6e01f80b761e0fbbfa288536311b3"
+checksum = "6100bc57b6209840798d95cb2775684849d332f7bd788db2a8c8caf7ef82a41a"
 dependencies = [
  "smallvec",
  "target-lexicon",
@@ -938,7 +938,7 @@ dependencies = [
  "i18n-embed-fl 0.7.0",
  "libcosmic",
  "once_cell",
- "rust-embed 8.1.0",
+ "rust-embed 8.2.0",
  "tracing",
 ]
 
@@ -968,10 +968,10 @@ dependencies = [
  "i18n-embed 0.13.9",
  "i18n-embed-fl 0.6.7",
  "libcosmic",
- "log",
- "nix 0.26.4",
+ "nix 0.27.1",
  "once_cell",
  "rust-embed 6.8.1",
+ "tracing",
  "tracing-log",
  "tracing-subscriber",
  "xdg",
@@ -990,7 +990,6 @@ dependencies = [
 [[package]]
 name = "cosmic-config"
 version = "0.1.0"
-source = "git+https://github.com/pop-os/libcosmic#6a952e9350f3c10d21eb2ccbe0d206ff0498a069"
 dependencies = [
  "atomicwrites",
  "cosmic-config-derive",
@@ -1008,7 +1007,6 @@ dependencies = [
 [[package]]
 name = "cosmic-config-derive"
 version = "0.1.0"
-source = "git+https://github.com/pop-os/libcosmic#6a952e9350f3c10d21eb2ccbe0d206ff0498a069"
 dependencies = [
  "quote",
  "syn 1.0.109",
@@ -1017,9 +1015,9 @@ dependencies = [
 [[package]]
 name = "cosmic-dbus-networkmanager"
 version = "0.1.0"
-source = "git+https://github.com/pop-os/dbus-settings-bindings#c9cb2c256eb956e0c09cb5c4409b0bb59e455b7f"
+source = "git+https://github.com/pop-os/dbus-settings-bindings#3644bc909984842f35adb1057ef6e0a277c1aa6a"
 dependencies = [
- "bitflags 2.4.1",
+ "bitflags 2.4.2",
  "derive_builder",
  "procfs",
  "thiserror",
@@ -1031,7 +1029,7 @@ dependencies = [
 [[package]]
 name = "cosmic-notifications-config"
 version = "0.1.0"
-source = "git+https://github.com/pop-os/cosmic-notifications#4775bc063e61db18f3e1d3c6d6a1405b1e11a92b"
+source = "git+https://github.com/pop-os/cosmic-notifications#8a6a0633332daf60092b3659ee7101dd209529f1"
 dependencies = [
  "cosmic-config",
  "serde",
@@ -1040,7 +1038,7 @@ dependencies = [
 [[package]]
 name = "cosmic-notifications-util"
 version = "0.1.0"
-source = "git+https://github.com/pop-os/cosmic-notifications#4775bc063e61db18f3e1d3c6d6a1405b1e11a92b"
+source = "git+https://github.com/pop-os/cosmic-notifications#8a6a0633332daf60092b3659ee7101dd209529f1"
 dependencies = [
  "bytemuck",
  "fast_image_resize",
@@ -1061,7 +1059,7 @@ dependencies = [
 [[package]]
 name = "cosmic-panel-config"
 version = "0.1.0"
-source = "git+https://github.com/pop-os/cosmic-panel#dcfa3eaf124571d039320d0dd9da6ae00743b153"
+source = "git+https://github.com/pop-os/cosmic-panel#0b9dcfe06ff5642420278ce097bb65874ffdeff4"
 dependencies = [
  "anyhow",
  "cosmic-config",
@@ -1077,7 +1075,7 @@ name = "cosmic-protocols"
 version = "0.1.0"
 source = "git+https://github.com/pop-os/cosmic-protocols?rev=e65fa5e#e65fa5e2bb47e51656221657049bd3f88ae9dae5"
 dependencies = [
- "bitflags 2.4.1",
+ "bitflags 2.4.2",
  "wayland-backend 0.3.2",
  "wayland-client 0.31.1",
  "wayland-protocols 0.31.0",
@@ -1098,14 +1096,14 @@ name = "cosmic-text"
 version = "0.10.0"
 source = "git+https://github.com/pop-os/cosmic-text.git?branch=refactor#dd4c4cbbe2d5ed5046054b5361a6eeead50e0bb0"
 dependencies = [
- "bitflags 2.4.1",
+ "bitflags 2.4.2",
  "fontdb",
  "libm",
  "log",
  "rangemap",
  "rustc-hash",
  "rustybuzz",
- "self_cell 1.0.2",
+ "self_cell 1.0.3",
  "swash",
  "sys-locale",
  "unicode-bidi",
@@ -1117,7 +1115,6 @@ dependencies = [
 [[package]]
 name = "cosmic-theme"
 version = "0.1.0"
-source = "git+https://github.com/pop-os/libcosmic#6a952e9350f3c10d21eb2ccbe0d206ff0498a069"
 dependencies = [
  "almost",
  "cosmic-config",
@@ -1131,7 +1128,6 @@ dependencies = [
 [[package]]
 name = "cosmic-time"
 version = "0.4.0"
-source = "git+https://github.com/pop-os/cosmic-time#4dc1fcec44aa7471a8e707fa391f9882d23250d7"
 dependencies = [
  "float-cmp",
  "libcosmic",
@@ -1140,9 +1136,9 @@ dependencies = [
 
 [[package]]
 name = "cpufeatures"
-version = "0.2.11"
+version = "0.2.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce420fe07aecd3e67c5f910618fe65e94158f6dcc0adf44e00d69ce2bdfe0fd0"
+checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504"
 dependencies = [
  "libc",
 ]
@@ -1158,46 +1154,37 @@ dependencies = [
 
 [[package]]
 name = "crossbeam-channel"
-version = "0.5.8"
+version = "0.5.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200"
+checksum = "176dc175b78f56c0f321911d9c8eb2b77a78a4860b9c19db83835fea1a46649b"
 dependencies = [
- "cfg-if",
  "crossbeam-utils",
 ]
 
 [[package]]
 name = "crossbeam-deque"
-version = "0.8.3"
+version = "0.8.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef"
+checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d"
 dependencies = [
- "cfg-if",
  "crossbeam-epoch",
  "crossbeam-utils",
 ]
 
 [[package]]
 name = "crossbeam-epoch"
-version = "0.9.15"
+version = "0.9.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7"
+checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e"
 dependencies = [
- "autocfg",
- "cfg-if",
  "crossbeam-utils",
- "memoffset 0.9.0",
- "scopeguard",
 ]
 
 [[package]]
 name = "crossbeam-utils"
-version = "0.8.16"
+version = "0.8.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294"
-dependencies = [
- "cfg-if",
-]
+checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345"
 
 [[package]]
 name = "crunchy"
@@ -1233,12 +1220,12 @@ dependencies = [
 
 [[package]]
 name = "ctor"
-version = "0.2.5"
+version = "0.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "37e366bff8cd32dd8754b0991fb66b279dc48f598c3a18914852a6673deef583"
+checksum = "30d2b3721e861707777e3195b0158f950ae6dc4a27e4d02ff9f67e3eb3de199e"
 dependencies = [
  "quote",
- "syn 2.0.40",
+ "syn 2.0.48",
 ]
 
 [[package]]
@@ -1273,7 +1260,7 @@ version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e16e44ab292b1dddfdaf7be62cfd8877df52f2f3fde5858d95bab606be259f20"
 dependencies = [
- "bitflags 2.4.1",
+ "bitflags 2.4.2",
  "libloading 0.8.1",
  "winapi",
 ]
@@ -1323,7 +1310,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "strsim",
- "syn 2.0.40",
+ "syn 2.0.48",
 ]
 
 [[package]]
@@ -1345,7 +1332,7 @@ checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5"
 dependencies = [
  "darling_core 0.20.3",
  "quote",
- "syn 2.0.40",
+ "syn 2.0.48",
 ]
 
 [[package]]
@@ -1402,9 +1389,9 @@ dependencies = [
 
 [[package]]
 name = "deranged"
-version = "0.3.10"
+version = "0.3.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8eb30d70a07a3b04884d2677f06bec33509dc67ca60d92949e5535352d3191dc"
+checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4"
 dependencies = [
  "powerfmt",
 ]
@@ -1460,7 +1447,7 @@ dependencies = [
  "darling 0.20.3",
  "proc-macro2",
  "quote",
- "syn 2.0.40",
+ "syn 2.0.48",
 ]
 
 [[package]]
@@ -1531,7 +1518,7 @@ checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.40",
+ "syn 2.0.48",
 ]
 
 [[package]]
@@ -1561,7 +1548,7 @@ version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "97fb1b703ffbc7ebd216eba7900008049a56ace55580ecb2ee7fa801e8d8be87"
 dependencies = [
- "bitflags 2.4.1",
+ "bitflags 2.4.2",
  "bytemuck",
  "drm-ffi",
  "drm-fourcc",
@@ -1625,7 +1612,7 @@ checksum = "f95e2801cd355d4a1a3e3953ce6ee5ae9603a5c833455343a8bfe3f44d418246"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.40",
+ "syn 2.0.48",
 ]
 
 [[package]]
@@ -1682,9 +1669,9 @@ dependencies = [
 
 [[package]]
 name = "event-listener"
-version = "4.0.0"
+version = "4.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "770d968249b5d99410d61f5bf89057f3199a077a04d087092f58e7d10692baae"
+checksum = "67b215c49b2b248c855fb73579eb1f4f26c38ffdc12973e20e07b91d78d5646e"
 dependencies = [
  "concurrent-queue",
  "parking",
@@ -1697,7 +1684,7 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "958e4d70b6d5e81971bebec42271ec641e7ff4e170a6fa605f2b8a8b65cb97d3"
 dependencies = [
- "event-listener 4.0.0",
+ "event-listener 4.0.3",
  "pin-project-lite",
 ]
 
@@ -1750,9 +1737,9 @@ checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5"
 
 [[package]]
 name = "fdeflate"
-version = "0.3.1"
+version = "0.3.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64d6dafc854908ff5da46ff3f8f473c6984119a2876a383a860246dd7841a868"
+checksum = "4f9bfee30e4dedf0ab8b422f03af778d9612b63f502710fc500a334ebe2de645"
 dependencies = [
  "simd-adler32",
 ]
@@ -1895,7 +1882,7 @@ checksum = "98b88c54a38407f7352dd2c4238830115a6377741098ffd1f997c813d0e088a6"
 dependencies = [
  "fontconfig-parser",
  "log",
- "memmap2 0.9.0",
+ "memmap2 0.9.3",
  "slotmap",
  "tinyvec",
  "ttf-parser",
@@ -1919,7 +1906,7 @@ checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.40",
+ "syn 2.0.48",
 ]
 
 [[package]]
@@ -1984,9 +1971,9 @@ dependencies = [
 
 [[package]]
 name = "futures"
-version = "0.3.29"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da0290714b38af9b4a7b094b8a37086d1b4e61f2df9122c3cad2577669145335"
+checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0"
 dependencies = [
  "futures-channel",
  "futures-core",
@@ -1999,9 +1986,9 @@ dependencies = [
 
 [[package]]
 name = "futures-channel"
-version = "0.3.29"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ff4dd66668b557604244583e3e1e1eada8c5c2e96a6d0d6653ede395b78bbacb"
+checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78"
 dependencies = [
  "futures-core",
  "futures-sink",
@@ -2009,15 +1996,15 @@ dependencies = [
 
 [[package]]
 name = "futures-core"
-version = "0.3.29"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb1d22c66e66d9d72e1758f0bd7d4fd0bee04cad842ee34587d68c07e45d088c"
+checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d"
 
 [[package]]
 name = "futures-executor"
-version = "0.3.29"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f4fb8693db0cf099eadcca0efe2a5a22e4550f98ed16aba6c48700da29597bc"
+checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d"
 dependencies = [
  "futures-core",
  "futures-task",
@@ -2027,9 +2014,9 @@ dependencies = [
 
 [[package]]
 name = "futures-io"
-version = "0.3.29"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8bf34a163b5c4c52d0478a4d757da8fb65cabef42ba90515efee0f6f9fa45aaa"
+checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1"
 
 [[package]]
 name = "futures-lite"
@@ -2048,9 +2035,9 @@ dependencies = [
 
 [[package]]
 name = "futures-lite"
-version = "2.1.0"
+version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aeee267a1883f7ebef3700f262d2d54de95dfaf38189015a74fdc4e0c7ad8143"
+checksum = "445ba825b27408685aaecefd65178908c36c6e96aaf6d8599419d46e624192ba"
 dependencies = [
  "fastrand 2.0.1",
  "futures-core",
@@ -2061,32 +2048,32 @@ dependencies = [
 
 [[package]]
 name = "futures-macro"
-version = "0.3.29"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "53b153fd91e4b0147f4aced87be237c98248656bb01050b96bf3ee89220a8ddb"
+checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.40",
+ "syn 2.0.48",
 ]
 
 [[package]]
 name = "futures-sink"
-version = "0.3.29"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e36d3378ee38c2a36ad710c5d30c2911d752cb941c00c72dbabfb786a7970817"
+checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5"
 
 [[package]]
 name = "futures-task"
-version = "0.3.29"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "efd193069b0ddadc69c46389b740bbccdd97203899b48d09c5f7969591d6bae2"
+checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004"
 
 [[package]]
 name = "futures-util"
-version = "0.3.29"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a19526d624e703a3179b3d322efec918b6246ea0fa51d41124525f00f1cc8104"
+checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48"
 dependencies = [
  "futures-channel",
  "futures-core",
@@ -2122,9 +2109,9 @@ dependencies = [
 
 [[package]]
 name = "getrandom"
-version = "0.2.11"
+version = "0.2.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fe9006bed769170c11f845cf00c7c1e9092aeb3f268e007c3e760ac68008070f"
+checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5"
 dependencies = [
  "cfg-if",
  "js-sys",
@@ -2188,11 +2175,11 @@ checksum = "b5418c17512bdf42730f9032c74e1ae39afc408745ebb2acf72fbc4691c17945"
 
 [[package]]
 name = "glib"
-version = "0.18.4"
+version = "0.18.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "951bbd7fdc5c044ede9f05170f05a3ae9479239c3afdfe2d22d537a3add15c4e"
+checksum = "233daaf6e83ae6a12a52055f568f9d7cf4671dabb78ff9560ab6da230ce00ee5"
 dependencies = [
- "bitflags 2.4.1",
+ "bitflags 2.4.2",
  "futures-channel",
  "futures-core",
  "futures-executor",
@@ -2210,16 +2197,16 @@ dependencies = [
 
 [[package]]
 name = "glib-macros"
-version = "0.18.3"
+version = "0.18.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72793962ceece3863c2965d7f10c8786323b17c7adea75a515809fa20ab799a5"
+checksum = "0bb0228f477c0900c880fd78c8759b95c7636dbd7842707f49e132378aa2acdc"
 dependencies = [
  "heck",
  "proc-macro-crate 2.0.0",
  "proc-macro-error",
  "proc-macro2",
  "quote",
- "syn 2.0.40",
+ "syn 2.0.48",
 ]
 
 [[package]]
@@ -2234,9 +2221,9 @@ dependencies = [
 
 [[package]]
 name = "glow"
-version = "0.13.0"
+version = "0.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "886c2a30b160c4c6fec8f987430c26b526b7988ca71f664e6a699ddf6f9601e4"
+checksum = "bd348e04c43b32574f2de31c8bb397d96c9fcfa1371bd4ca6d8bdc464ab121b1"
 dependencies = [
  "js-sys",
  "slotmap",
@@ -2281,7 +2268,7 @@ version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fbcd2dba93594b227a1f57ee09b8b9da8892c34d55aa332e034a228d0fe6a171"
 dependencies = [
- "bitflags 2.4.1",
+ "bitflags 2.4.2",
  "gpu-alloc-types",
 ]
 
@@ -2291,7 +2278,7 @@ version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "98ff03b468aa837d70984d55f5d3f846f6ec31fe34bbb97c4f85219caeee1ca4"
 dependencies = [
- "bitflags 2.4.1",
+ "bitflags 2.4.2",
 ]
 
 [[package]]
@@ -2314,7 +2301,7 @@ version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cc11df1ace8e7e564511f53af41f3e42ddc95b56fd07b3f4445d2a6048bc682c"
 dependencies = [
- "bitflags 2.4.1",
+ "bitflags 2.4.2",
  "gpu-descriptor-types",
  "hashbrown 0.14.3",
 ]
@@ -2325,7 +2312,7 @@ version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6bf0b36e6f090b7e1d8a4b49c0cb81c1f8376f72198c65dd3ad9ff3556b8b78c"
 dependencies = [
- "bitflags 2.4.1",
+ "bitflags 2.4.2",
 ]
 
 [[package]]
@@ -2369,7 +2356,7 @@ version = "0.14.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604"
 dependencies = [
- "ahash 0.8.6",
+ "ahash 0.8.7",
  "allocator-api2",
 ]
 
@@ -2396,9 +2383,9 @@ checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
 
 [[package]]
 name = "hermit-abi"
-version = "0.3.3"
+version = "0.3.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7"
+checksum = "5d3d0e0f38255e7fa3cf31335b3a56f05febd18025f4db5ef7a0cfb4f8da651f"
 
 [[package]]
 name = "hex"
@@ -2464,7 +2451,7 @@ dependencies = [
  "locale_config",
  "log",
  "parking_lot 0.12.1",
- "rust-embed 8.1.0",
+ "rust-embed 8.2.0",
  "thiserror",
  "unic-langid",
  "walkdir",
@@ -2487,7 +2474,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "strsim",
- "syn 2.0.40",
+ "syn 2.0.48",
  "unic-langid",
 ]
 
@@ -2508,7 +2495,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "strsim",
- "syn 2.0.40",
+ "syn 2.0.48",
  "unic-langid",
 ]
 
@@ -2522,21 +2509,21 @@ dependencies = [
  "i18n-config",
  "proc-macro2",
  "quote",
- "syn 2.0.40",
+ "syn 2.0.48",
 ]
 
 [[package]]
 name = "iana-time-zone"
-version = "0.1.58"
+version = "0.1.59"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8326b86b6cff230b97d0d312a6c40a60726df3332e721f72a1b035f451663b20"
+checksum = "b6a67363e2aa4443928ce15e57ebae94fd8949958fd1223c4cfc0cd473ad7539"
 dependencies = [
  "android_system_properties",
  "core-foundation-sys",
  "iana-time-zone-haiku",
  "js-sys",
  "wasm-bindgen",
- "windows-core",
+ "windows-core 0.52.0",
 ]
 
 [[package]]
@@ -2551,7 +2538,6 @@ dependencies = [
 [[package]]
 name = "iced"
 version = "0.12.0"
-source = "git+https://github.com/pop-os/libcosmic#6a952e9350f3c10d21eb2ccbe0d206ff0498a069"
 dependencies = [
  "iced_accessibility",
  "iced_core",
@@ -2566,7 +2552,6 @@ dependencies = [
 [[package]]
 name = "iced_accessibility"
 version = "0.1.0"
-source = "git+https://github.com/pop-os/libcosmic#6a952e9350f3c10d21eb2ccbe0d206ff0498a069"
 dependencies = [
  "accesskit",
  "accesskit_unix",
@@ -2575,7 +2560,6 @@ dependencies = [
 [[package]]
 name = "iced_core"
 version = "0.12.0"
-source = "git+https://github.com/pop-os/libcosmic#6a952e9350f3c10d21eb2ccbe0d206ff0498a069"
 dependencies = [
  "bitflags 1.3.2",
  "iced_accessibility",
@@ -2593,7 +2577,6 @@ dependencies = [
 [[package]]
 name = "iced_futures"
 version = "0.12.0"
-source = "git+https://github.com/pop-os/libcosmic#6a952e9350f3c10d21eb2ccbe0d206ff0498a069"
 dependencies = [
  "futures",
  "iced_core",
@@ -2606,7 +2589,6 @@ dependencies = [
 [[package]]
 name = "iced_graphics"
 version = "0.12.0"
-source = "git+https://github.com/pop-os/libcosmic#6a952e9350f3c10d21eb2ccbe0d206ff0498a069"
 dependencies = [
  "bitflags 1.3.2",
  "bytemuck",
@@ -2629,7 +2611,6 @@ dependencies = [
 [[package]]
 name = "iced_renderer"
 version = "0.12.0"
-source = "git+https://github.com/pop-os/libcosmic#6a952e9350f3c10d21eb2ccbe0d206ff0498a069"
 dependencies = [
  "iced_graphics",
  "iced_tiny_skia",
@@ -2642,7 +2623,6 @@ dependencies = [
 [[package]]
 name = "iced_runtime"
 version = "0.12.0"
-source = "git+https://github.com/pop-os/libcosmic#6a952e9350f3c10d21eb2ccbe0d206ff0498a069"
 dependencies = [
  "iced_accessibility",
  "iced_core",
@@ -2654,7 +2634,6 @@ dependencies = [
 [[package]]
 name = "iced_sctk"
 version = "0.1.0"
-source = "git+https://github.com/pop-os/libcosmic#6a952e9350f3c10d21eb2ccbe0d206ff0498a069"
 dependencies = [
  "enum-repr",
  "float-cmp",
@@ -2678,7 +2657,6 @@ dependencies = [
 [[package]]
 name = "iced_style"
 version = "0.12.0"
-source = "git+https://github.com/pop-os/libcosmic#6a952e9350f3c10d21eb2ccbe0d206ff0498a069"
 dependencies = [
  "iced_core",
  "once_cell",
@@ -2688,7 +2666,6 @@ dependencies = [
 [[package]]
 name = "iced_tiny_skia"
 version = "0.12.0"
-source = "git+https://github.com/pop-os/libcosmic#6a952e9350f3c10d21eb2ccbe0d206ff0498a069"
 dependencies = [
  "bytemuck",
  "cosmic-text",
@@ -2706,7 +2683,6 @@ dependencies = [
 [[package]]
 name = "iced_wgpu"
 version = "0.12.0"
-source = "git+https://github.com/pop-os/libcosmic#6a952e9350f3c10d21eb2ccbe0d206ff0498a069"
 dependencies = [
  "bitflags 1.3.2",
  "bytemuck",
@@ -2726,7 +2702,6 @@ dependencies = [
 [[package]]
 name = "iced_widget"
 version = "0.12.0"
-source = "git+https://github.com/pop-os/libcosmic#6a952e9350f3c10d21eb2ccbe0d206ff0498a069"
 dependencies = [
  "iced_renderer",
  "iced_runtime",
@@ -2767,9 +2742,9 @@ dependencies = [
 
 [[package]]
 name = "image"
-version = "0.24.7"
+version = "0.24.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f3dfdbdd72063086ff443e297b61695500514b1e41095b6fb9a5ab48a70a711"
+checksum = "034bbe799d1909622a74d1193aa50147769440040ff36cb2baa947609b0a4e23"
 dependencies = [
  "bytemuck",
  "byteorder",
@@ -2777,7 +2752,6 @@ dependencies = [
  "exr",
  "gif",
  "jpeg-decoder",
- "num-rational",
  "num-traits",
  "png",
  "qoi",
@@ -2891,18 +2865,18 @@ checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c"
 
 [[package]]
 name = "jpeg-decoder"
-version = "0.3.0"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc0000e42512c92e31c2252315bda326620a4e034105e900c98ec492fa077b3e"
+checksum = "f5d4a7da358eff58addd2877a45865158f0d78c911d43a5784ceb7bbf52833b0"
 dependencies = [
  "rayon",
 ]
 
 [[package]]
 name = "js-sys"
-version = "0.3.66"
+version = "0.3.67"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cee9c64da59eae3b50095c18d3e74f8b73c0b86d2792824ff01bbce68ba229ca"
+checksum = "9a1d36f1235bc969acba30b7f5990b864423a6068a10f7c90ae8f0112e3a59d1"
 dependencies = [
  "wasm-bindgen",
 ]
@@ -2976,14 +2950,13 @@ checksum = "03087c2bad5e1034e8cace5926dec053fb3790248370865f5117a7d0213354c8"
 
 [[package]]
 name = "libc"
-version = "0.2.151"
+version = "0.2.152"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "302d7ab3130588088d277783b1e2d2e10c9e9e4a16dd9050e6ec93fb3e7048f4"
+checksum = "13e3bf6590cbc649f4d1a3eefc9d5d6eb746f5200ffb04e5e142700b8faa56e7"
 
 [[package]]
 name = "libcosmic"
 version = "0.1.0"
-source = "git+https://github.com/pop-os/libcosmic#6a952e9350f3c10d21eb2ccbe0d206ff0498a069"
 dependencies = [
  "apply",
  "ashpd",
@@ -3110,7 +3083,7 @@ version = "0.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "85c833ca1e66078851dba29046874e38f08b2c883700aa29a03ddd3b23814ee8"
 dependencies = [
- "bitflags 2.4.1",
+ "bitflags 2.4.2",
  "libc",
  "redox_syscall 0.4.1",
 ]
@@ -3123,9 +3096,9 @@ checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519"
 
 [[package]]
 name = "linux-raw-sys"
-version = "0.4.12"
+version = "0.4.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4cd1a83af159aa67994778be9070f0ae1bd732942279cabb14f86f986a21456"
+checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c"
 
 [[package]]
 name = "locale_config"
@@ -3197,9 +3170,9 @@ dependencies = [
 
 [[package]]
 name = "lyon_geom"
-version = "1.0.4"
+version = "1.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "74df1ff0a0147282eb10699537a03baa7d31972b58984a1d44ce0624043fe8ad"
+checksum = "edecfb8d234a2b0be031ab02ebcdd9f3b9ee418fb35e265f7a540a48d197bff9"
 dependencies = [
  "arrayvec",
  "euclid",
@@ -3218,13 +3191,13 @@ dependencies = [
 
 [[package]]
 name = "lyon_tessellation"
-version = "1.0.12"
+version = "1.0.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f5bcf02928361d18e6edb8ad3bc5b93cba8aa57e2508deb072c2d2ade8bbd0d"
+checksum = "8c7c67b5bc8123b352b2e7e742b47d1f236a13fe77619433be9568fbd888e9c0"
 dependencies = [
  "float_next_after",
  "lyon_path",
- "thiserror",
+ "num-traits",
 ]
 
 [[package]]
@@ -3244,9 +3217,9 @@ dependencies = [
 
 [[package]]
 name = "memchr"
-version = "2.6.4"
+version = "2.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167"
+checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149"
 
 [[package]]
 name = "memmap2"
@@ -3268,9 +3241,9 @@ dependencies = [
 
 [[package]]
 name = "memmap2"
-version = "0.9.0"
+version = "0.9.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "deaba38d7abf1d4cca21cc89e932e542ba2b9258664d2a9ef0e61512039c9375"
+checksum = "45fd3a57831bf88bc63f8cebc0cf956116276e97fef3966103e96416209f7c92"
 dependencies = [
  "libc",
 ]
@@ -3308,7 +3281,7 @@ version = "0.27.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c43f73953f8cbe511f021b58f18c3ce1c3d1ae13fe953293e13345bf83217f25"
 dependencies = [
- "bitflags 2.4.1",
+ "bitflags 2.4.2",
  "block",
  "core-graphics-types",
  "foreign-types",
@@ -3342,7 +3315,7 @@ dependencies = [
 [[package]]
 name = "mpris2-zbus"
 version = "0.1.0"
-source = "git+https://github.com/pop-os/dbus-settings-bindings#c9cb2c256eb956e0c09cb5c4409b0bb59e455b7f"
+source = "git+https://github.com/pop-os/dbus-settings-bindings#3644bc909984842f35adb1057ef6e0a277c1aa6a"
 dependencies = [
  "serde",
  "thiserror",
@@ -3364,7 +3337,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ae585df4b6514cf8842ac0f1ab4992edc975892704835b549cf818dc0191249e"
 dependencies = [
  "bit-set",
- "bitflags 2.4.1",
+ "bitflags 2.4.2",
  "codespan-reporting",
  "hexf-parse",
  "indexmap",
@@ -3417,7 +3390,7 @@ version = "0.27.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053"
 dependencies = [
- "bitflags 2.4.1",
+ "bitflags 2.4.2",
  "cfg-if",
  "libc",
 ]
@@ -3428,7 +3401,7 @@ version = "6.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6205bd8bb1e454ad2e27422015fb5e4f2bcc7e08fa8f27058670d208324a4d2d"
 dependencies = [
- "bitflags 2.4.1",
+ "bitflags 2.4.2",
  "crossbeam-channel",
  "filetime",
  "fsevent-sys",
@@ -3590,9 +3563,9 @@ dependencies = [
 
 [[package]]
 name = "object"
-version = "0.32.1"
+version = "0.32.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0"
+checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441"
 dependencies = [
  "memchr",
 ]
@@ -3650,7 +3623,7 @@ dependencies = [
  "proc-macro-error",
  "proc-macro2",
  "quote",
- "syn 2.0.40",
+ "syn 2.0.48",
 ]
 
 [[package]]
@@ -3680,7 +3653,7 @@ checksum = "b7db010ec5ff3d4385e4f133916faacd9dad0f6a09394c92d825b3aed310fa0a"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.40",
+ "syn 2.0.48",
 ]
 
 [[package]]
@@ -3779,7 +3752,7 @@ dependencies = [
  "phf_shared",
  "proc-macro2",
  "quote",
- "syn 2.0.40",
+ "syn 2.0.48",
 ]
 
 [[package]]
@@ -3814,7 +3787,7 @@ checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.40",
+ "syn 2.0.48",
 ]
 
 [[package]]
@@ -3842,15 +3815,15 @@ dependencies = [
 
 [[package]]
 name = "pkg-config"
-version = "0.3.27"
+version = "0.3.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964"
+checksum = "2900ede94e305130c13ddd391e0ab7cbaeb783945ae07a279c268cb05109c6cb"
 
 [[package]]
 name = "png"
-version = "0.17.10"
+version = "0.17.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd75bf2d8dd3702b9707cdbc56a5b9ef42cec752eb8b3bafc01234558442aa64"
+checksum = "1f6c3c3e617595665b8ea2ff95a86066be38fb121ff920a9c0eb282abcd1da5a"
 dependencies = [
  "bitflags 1.3.2",
  "crc32fast",
@@ -3877,14 +3850,14 @@ dependencies = [
 
 [[package]]
 name = "polling"
-version = "3.3.1"
+version = "3.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf63fa624ab313c11656b4cda960bfc46c410187ad493c41f6ba2d8c1e991c9e"
+checksum = "545c980a3880efd47b2e262f6a4bb6daad6555cf3367aa9c4e52895f69537a41"
 dependencies = [
  "cfg-if",
  "concurrent-queue",
  "pin-project-lite",
- "rustix 0.38.28",
+ "rustix 0.38.30",
  "tracing",
  "windows-sys 0.52.0",
 ]
@@ -3952,9 +3925,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.70"
+version = "1.0.76"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b"
+checksum = "95fc56cda0b5c3325f5fbbd7ff9fda9e02bb00bb3dac51252d2f1bfa1cb8cc8c"
 dependencies = [
  "unicode-ident",
 ]
@@ -3965,11 +3938,11 @@ version = "0.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "731e0d9356b0c25f16f33b5be79b1c57b562f141ebfcdb0ad8ac2c13a24293b4"
 dependencies = [
- "bitflags 2.4.1",
+ "bitflags 2.4.2",
  "hex",
  "lazy_static",
  "procfs-core",
- "rustix 0.38.28",
+ "rustix 0.38.30",
 ]
 
 [[package]]
@@ -3978,15 +3951,15 @@ version = "0.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2d3554923a69f4ce04c4a754260c338f505ce22642d3830e049a399fc2059a29"
 dependencies = [
- "bitflags 2.4.1",
+ "bitflags 2.4.2",
  "hex",
 ]
 
 [[package]]
 name = "profiling"
-version = "1.0.12"
+version = "1.0.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1de09527cd2ea2c2d59fb6c2f8c1ab8c71709ed9d1b6d60b0e1c9fbb6fdcb33c"
+checksum = "d135ede8821cf6376eb7a64148901e1690b788c11ae94dc297ae917dbc91dc0e"
 
 [[package]]
 name = "qoi"
@@ -4017,9 +3990,9 @@ dependencies = [
 
 [[package]]
 name = "quote"
-version = "1.0.33"
+version = "1.0.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae"
+checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
 dependencies = [
  "proc-macro2",
 ]
@@ -4074,9 +4047,9 @@ checksum = "f2ff9a1f06a88b01621b7ae906ef0211290d1c8a168a15542486a8f61c0833b9"
 
 [[package]]
 name = "rayon"
-version = "1.8.0"
+version = "1.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c27db03db7734835b3f53954b534c91069375ce6ccaa2e065441e07d9b6cdb1"
+checksum = "fa7237101a77a10773db45d62004a272517633fbcc3df19d96455ede1122e051"
 dependencies = [
  "either",
  "rayon-core",
@@ -4084,9 +4057,9 @@ dependencies = [
 
 [[package]]
 name = "rayon-core"
-version = "1.12.0"
+version = "1.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ce3fb6ad83f861aac485e76e1985cd109d9a3713802152be56c3b1f0e0658ed"
+checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2"
 dependencies = [
  "crossbeam-deque",
  "crossbeam-utils",
@@ -4195,7 +4168,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b91f7eff05f748767f183df4320a63d6936e9c6107d97c9e6bdd9784f4289c94"
 dependencies = [
  "base64",
- "bitflags 2.4.1",
+ "bitflags 2.4.2",
  "serde",
  "serde_derive",
 ]
@@ -4228,12 +4201,12 @@ dependencies = [
 
 [[package]]
 name = "rust-embed"
-version = "8.1.0"
+version = "8.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "810294a8a4a0853d4118e3b94bb079905f2107c7fe979d8f0faae98765eb6378"
+checksum = "a82c0bbc10308ed323529fd3c1dce8badda635aa319a5ff0e6466f33b8101e3f"
 dependencies = [
- "rust-embed-impl 8.1.0",
- "rust-embed-utils 8.1.0",
+ "rust-embed-impl 8.2.0",
+ "rust-embed-utils 8.2.0",
  "walkdir",
 ]
 
@@ -4246,20 +4219,20 @@ dependencies = [
  "proc-macro2",
  "quote",
  "rust-embed-utils 7.8.1",
- "syn 2.0.40",
+ "syn 2.0.48",
  "walkdir",
 ]
 
 [[package]]
 name = "rust-embed-impl"
-version = "8.1.0"
+version = "8.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bfc144a1273124a67b8c1d7cd19f5695d1878b31569c0512f6086f0f4676604e"
+checksum = "6227c01b1783cdfee1bcf844eb44594cd16ec71c35305bf1c9fb5aade2735e16"
 dependencies = [
  "proc-macro2",
  "quote",
- "rust-embed-utils 8.1.0",
- "syn 2.0.40",
+ "rust-embed-utils 8.2.0",
+ "syn 2.0.48",
  "walkdir",
 ]
 
@@ -4275,9 +4248,9 @@ dependencies = [
 
 [[package]]
 name = "rust-embed-utils"
-version = "8.1.0"
+version = "8.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "816ccd4875431253d6bb54b804bcff4369cbde9bae33defde25fdf6c2ef91d40"
+checksum = "8cb0a25bfbb2d4b4402179c2cf030387d9990857ce08a32592c6238db9fa8665"
 dependencies = [
  "sha2",
  "walkdir",
@@ -4321,14 +4294,14 @@ dependencies = [
 
 [[package]]
 name = "rustix"
-version = "0.38.28"
+version = "0.38.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72e572a5e8ca657d7366229cdde4bd14c4eb5499a9573d4d366fe1b599daa316"
+checksum = "322394588aaf33c24007e8bb3238ee3e4c5c09c084ab32bc73890b99ff326bca"
 dependencies = [
- "bitflags 2.4.1",
+ "bitflags 2.4.2",
  "errno",
  "libc",
- "linux-raw-sys 0.4.12",
+ "linux-raw-sys 0.4.13",
  "windows-sys 0.52.0",
 ]
 
@@ -4344,7 +4317,7 @@ version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f0ae5692c5beaad6a9e22830deeed7874eae8a4e3ba4076fb48e12c56856222c"
 dependencies = [
- "bitflags 2.4.1",
+ "bitflags 2.4.2",
  "bytemuck",
  "libm",
  "smallvec",
@@ -4388,14 +4361,14 @@ version = "0.10.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e14e4d63b804dc0c7ec4a1e52bcb63f02c7ac94476755aa579edac21e01f915d"
 dependencies = [
- "self_cell 1.0.2",
+ "self_cell 1.0.3",
 ]
 
 [[package]]
 name = "self_cell"
-version = "1.0.2"
+version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e388332cd64eb80cd595a00941baf513caffae8dce9cfd0467fc9c66397dade6"
+checksum = "58bf37232d3bb9a2c4e641ca2a11d83b5062066f88df7fed36c28772046d65ba"
 
 [[package]]
 name = "sendfd"
@@ -4409,29 +4382,29 @@ dependencies = [
 
 [[package]]
 name = "serde"
-version = "1.0.193"
+version = "1.0.195"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "25dd9975e68d0cb5aa1120c288333fc98731bd1dd12f561e468ea4728c042b89"
+checksum = "63261df402c67811e9ac6def069e4786148c4563f4b50fd4bf30aa370d626b02"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.193"
+version = "1.0.195"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3"
+checksum = "46fe8f8603d81ba86327b23a2e9cdf49e1255fb94a4c5f297f6ee0547178ea2c"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.40",
+ "syn 2.0.48",
 ]
 
 [[package]]
 name = "serde_json"
-version = "1.0.108"
+version = "1.0.111"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b"
+checksum = "176e46fa42316f18edd598015a5166857fc835ec732f5215eac6b7bdbf0a84f4"
 dependencies = [
  "itoa",
  "ryu",
@@ -4440,20 +4413,20 @@ dependencies = [
 
 [[package]]
 name = "serde_repr"
-version = "0.1.17"
+version = "0.1.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3081f5ffbb02284dda55132aa26daecedd7372a42417bbbab6f14ab7d6bb9145"
+checksum = "0b2e6b945e9d3df726b65d6ee24060aff8e3533d431f677a9695db04eff9dfdb"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.40",
+ "syn 2.0.48",
 ]
 
 [[package]]
 name = "serde_spanned"
-version = "0.6.4"
+version = "0.6.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "12022b835073e5b11e90a14f86838ceb1c8fb0325b72416845c487ac0fa95e80"
+checksum = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1"
 dependencies = [
  "serde",
 ]
@@ -4545,9 +4518,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.11.2"
+version = "1.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
+checksum = "3b187f0231d56fe41bfb12034819dd2bf336422a5866de41bc3fec4b2e3883e8"
 
 [[package]]
 name = "smithay-client-toolkit"
@@ -4572,16 +4545,16 @@ name = "smithay-client-toolkit"
 version = "0.18.0"
 source = "git+https://github.com/smithay/client-toolkit//?rev=e63ab5f#e63ab5f01964bc48766fc4c3bf79cc05dc59874c"
 dependencies = [
- "bitflags 2.4.1",
+ "bitflags 2.4.2",
  "bytemuck",
  "calloop",
  "calloop-wayland-source",
  "cursor-icon",
  "libc",
  "log",
- "memmap2 0.9.0",
+ "memmap2 0.9.3",
  "pkg-config",
- "rustix 0.38.28",
+ "rustix 0.38.30",
  "thiserror",
  "wayland-backend 0.3.2",
  "wayland-client 0.31.1",
@@ -4639,11 +4612,11 @@ dependencies = [
  "foreign-types",
  "js-sys",
  "log",
- "memmap2 0.9.0",
+ "memmap2 0.9.3",
  "objc",
  "raw-window-handle",
  "redox_syscall 0.4.1",
- "rustix 0.38.28",
+ "rustix 0.38.30",
  "tiny-xlib",
  "wasm-bindgen",
  "wayland-backend 0.3.2",
@@ -4755,9 +4728,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.40"
+version = "2.0.48"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "13fa70a4ee923979ffb522cacce59d34421ebdea5625e1073c4326ef9d2dd42e"
+checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -4811,56 +4784,56 @@ dependencies = [
 
 [[package]]
 name = "target-lexicon"
-version = "0.12.12"
+version = "0.12.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "14c39fd04924ca3a864207c66fc2cd7d22d7c016007f9ce846cbb9326331930a"
+checksum = "69758bda2e78f098e4ccb393021a0963bb3442eac05f135c30f61b7370bbafae"
 
 [[package]]
 name = "temp-dir"
-version = "0.1.11"
+version = "0.1.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af547b166dd1ea4b472165569fc456cfb6818116f854690b0ff205e636523dab"
+checksum = "dd16aa9ffe15fe021c6ee3766772132c6e98dfa395a167e16864f61a9cfb71d6"
 
 [[package]]
 name = "tempfile"
-version = "3.8.1"
+version = "3.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ef1adac450ad7f4b3c28589471ade84f25f731a7a0fe30d71dfa9f60fd808e5"
+checksum = "01ce4141aa927a6d1bd34a041795abd0db1cccba5d5f24b009f694bdf3a1f3fa"
 dependencies = [
  "cfg-if",
  "fastrand 2.0.1",
  "redox_syscall 0.4.1",
- "rustix 0.38.28",
- "windows-sys 0.48.0",
+ "rustix 0.38.30",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
 name = "termcolor"
-version = "1.4.0"
+version = "1.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ff1bc3d3f05aff0403e8ac0d92ced918ec05b666a43f83297ccef5bea8a3d449"
+checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755"
 dependencies = [
  "winapi-util",
 ]
 
 [[package]]
 name = "thiserror"
-version = "1.0.50"
+version = "1.0.56"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f9a7210f5c9a7156bb50aa36aed4c95afb51df0df00713949448cf9e97d382d2"
+checksum = "d54378c645627613241d077a3a79db965db602882668f9136ac42af9ecb730ad"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.50"
+version = "1.0.56"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8"
+checksum = "fa0faa943b50f3db30a20aa7e265dbc66076993efed8463e8de414e5d06d3471"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.40",
+ "syn 2.0.48",
 ]
 
 [[package]]
@@ -4875,9 +4848,9 @@ dependencies = [
 
 [[package]]
 name = "tiff"
-version = "0.9.0"
+version = "0.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d172b0f4d3fba17ba89811858b9d3d97f928aece846475bbda076ca46736211"
+checksum = "ba1310fcea54c6a9a4fd1aad794ecc02c31682f6bfbecdf460bf19533eed1e3e"
 dependencies = [
  "flate2",
  "jpeg-decoder",
@@ -4886,9 +4859,9 @@ dependencies = [
 
 [[package]]
 name = "time"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4a34ab300f2dee6e562c10a046fc05e358b29f9bf92277f30c3c8d82275f6f5"
+checksum = "f657ba42c3f86e7680e53c8cd3af8abbe56b5491790b46e22e19c0d57463583e"
 dependencies = [
  "deranged",
  "powerfmt",
@@ -4905,9 +4878,9 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3"
 
 [[package]]
 name = "time-macros"
-version = "0.2.15"
+version = "0.2.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ad70d68dba9e1f8aceda7aa6711965dfec1cac869f311a51bd08b3a2ccbce20"
+checksum = "26197e33420244aeb70c3e8c78376ca46571bc4e701e4791c2cd9f57dcb3a43f"
 dependencies = [
  "time-core",
 ]
@@ -4976,9 +4949,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
 
 [[package]]
 name = "tokio"
-version = "1.35.0"
+version = "1.35.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "841d45b238a16291a4e1584e61820b8ae57d696cc5015c459c229ccc6990cc1c"
+checksum = "c89b4efa943be685f629b149f53829423f8f5531ea21249408e8e2f8671ec104"
 dependencies = [
  "backtrace",
  "bytes",
@@ -5002,7 +4975,7 @@ checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.40",
+ "syn 2.0.48",
 ]
 
 [[package]]
@@ -5100,7 +5073,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.40",
+ "syn 2.0.48",
 ]
 
 [[package]]
@@ -5161,28 +5134,29 @@ checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825"
 
 [[package]]
 name = "uds_windows"
-version = "1.0.2"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce65604324d3cce9b966701489fbd0cf318cb1f7bd9dd07ac9a4ee6fb791930d"
+checksum = "89daebc3e6fd160ac4aa9fc8b3bf71e1f74fbf92367ae71fb83a037e8bf164b9"
 dependencies = [
+ "memoffset 0.9.0",
  "tempfile",
  "winapi",
 ]
 
 [[package]]
 name = "unic-langid"
-version = "0.9.3"
+version = "0.9.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "887622f8e7b723780c5e64b04dcc0c9b8f426ada7cca6790cd3ea3bf0f08037a"
+checksum = "238722e6d794ed130f91f4ea33e01fcff4f188d92337a21297892521c72df516"
 dependencies = [
  "unic-langid-impl",
 ]
 
 [[package]]
 name = "unic-langid-impl"
-version = "0.9.3"
+version = "0.9.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5adeb847e35eed4efbffd9fb2e4d078b91ece56e4d6a3c0d2df55b3a1dac07d5"
+checksum = "4bd55a2063fdea4ef1f8633243a7b0524cbeef1905ae04c31a1c9b9775c55bc6"
 dependencies = [
  "serde",
  "tinystr",
@@ -5190,9 +5164,9 @@ dependencies = [
 
 [[package]]
 name = "unicode-bidi"
-version = "0.3.14"
+version = "0.3.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f2528f27a9eb2b21e69c95319b30bd0efd85d09c379741b0f78ea1d86be2416"
+checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75"
 
 [[package]]
 name = "unicode-bidi-mirroring"
@@ -5229,9 +5203,9 @@ dependencies = [
 
 [[package]]
 name = "unicode-properties"
-version = "0.1.0"
+version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c7f91c8b21fbbaa18853c3d0801c78f4fc94cdb976699bb03e832e75f7fd22f0"
+checksum = "e4259d9d4425d9f0661581b804cb85fe66a4c631cadd8f490d1c13a35d5d9291"
 
 [[package]]
 name = "unicode-script"
@@ -5387,9 +5361,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
 
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.89"
+version = "0.2.90"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ed0d4f68a3015cc185aff4db9506a015f4b96f95303897bfa23f846db54064e"
+checksum = "b1223296a201415c7fad14792dbefaace9bd52b62d33453ade1c5b5f07555406"
 dependencies = [
  "cfg-if",
  "wasm-bindgen-macro",
@@ -5397,24 +5371,24 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-backend"
-version = "0.2.89"
+version = "0.2.90"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b56f625e64f3a1084ded111c4d5f477df9f8c92df113852fa5a374dbda78826"
+checksum = "fcdc935b63408d58a32f8cc9738a0bffd8f05cc7c002086c6ef20b7312ad9dcd"
 dependencies = [
  "bumpalo",
  "log",
  "once_cell",
  "proc-macro2",
  "quote",
- "syn 2.0.40",
+ "syn 2.0.48",
  "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-futures"
-version = "0.4.39"
+version = "0.4.40"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac36a15a220124ac510204aec1c3e5db8a22ab06fd6706d881dc6149f8ed9a12"
+checksum = "bde2032aeb86bdfaecc8b261eef3cba735cc426c1f3a3416d1e0791be95fc461"
 dependencies = [
  "cfg-if",
  "js-sys",
@@ -5424,9 +5398,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.89"
+version = "0.2.90"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0162dbf37223cd2afce98f3d0785506dcb8d266223983e4b5b525859e6e182b2"
+checksum = "3e4c238561b2d428924c49815533a8b9121c664599558a5d9ec51f8a1740a999"
 dependencies = [
  "quote",
  "wasm-bindgen-macro-support",
@@ -5434,22 +5408,22 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.89"
+version = "0.2.90"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f0eb82fcb7930ae6219a7ecfd55b217f5f0893484b7a13022ebb2b2bf20b5283"
+checksum = "bae1abb6806dc1ad9e560ed242107c0f6c84335f1749dd4e8ddb012ebd5e25a7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.40",
+ "syn 2.0.48",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.89"
+version = "0.2.90"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ab9b36309365056cd639da3134bf87fa8f3d86008abf99e612384a6eecd459f"
+checksum = "4d91413b1c31d7539ba5ef2451af3f0b833a005eb27a631cec32bc0635a8602b"
 
 [[package]]
 name = "wasm-timer"
@@ -5529,7 +5503,7 @@ version = "0.31.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1ca7d52347346f5473bf2f56705f360e8440873052e575e55890c4fa57843ed3"
 dependencies = [
- "bitflags 2.4.1",
+ "bitflags 2.4.2",
  "nix 0.26.4",
  "wayland-backend 0.3.2",
  "wayland-scanner 0.31.0",
@@ -5553,7 +5527,7 @@ version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "625c5029dbd43d25e6aa9615e88b829a5cad13b2819c4ae129fdbb7c31ab4c7e"
 dependencies = [
- "bitflags 2.4.1",
+ "bitflags 2.4.2",
  "cursor-icon",
  "wayland-backend 0.3.2",
 ]
@@ -5610,7 +5584,7 @@ version = "0.31.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e253d7107ba913923dc253967f35e8561a3c65f914543e46843c88ddd729e21c"
 dependencies = [
- "bitflags 2.4.1",
+ "bitflags 2.4.2",
  "wayland-backend 0.3.2",
  "wayland-client 0.31.1",
  "wayland-scanner 0.31.0",
@@ -5623,7 +5597,7 @@ version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ad1f61b76b6c2d8742e10f9ba5c3737f6530b4c243132c2a2ccc8aa96fe25cd6"
 dependencies = [
- "bitflags 2.4.1",
+ "bitflags 2.4.2",
  "wayland-backend 0.3.2",
  "wayland-client 0.31.1",
  "wayland-protocols 0.31.0",
@@ -5670,7 +5644,7 @@ version = "0.31.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3f3f0c52a445936ca1184c98f1a69cf4ad9c9130788884531ef04428468cb1ce"
 dependencies = [
- "bitflags 2.4.1",
+ "bitflags 2.4.2",
  "downcast-rs",
  "io-lifetimes 2.0.3",
  "nix 0.26.4",
@@ -5761,7 +5735,7 @@ checksum = "ef91c1d62d1e9e81c79e600131a258edf75c9531cbdbde09c44a011a47312726"
 dependencies = [
  "arrayvec",
  "bit-vec",
- "bitflags 2.4.1",
+ "bitflags 2.4.2",
  "codespan-reporting",
  "log",
  "naga",
@@ -5786,7 +5760,7 @@ dependencies = [
  "arrayvec",
  "ash",
  "bit-set",
- "bitflags 2.4.1",
+ "bitflags 2.4.2",
  "block",
  "core-graphics-types",
  "d3d12",
@@ -5825,7 +5799,7 @@ version = "0.18.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0d5ed5f0edf0de351fe311c53304986315ce866f394a2e6df0c4b3c70774bcdd"
 dependencies = [
- "bitflags 2.4.1",
+ "bitflags 2.4.2",
  "js-sys",
  "web-sys",
 ]
@@ -5882,7 +5856,7 @@ version = "0.51.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ca229916c5ee38c2f2bc1e9d8f04df975b4bd93f9955dc69fabb5d91270045c9"
 dependencies = [
- "windows-core",
+ "windows-core 0.51.1",
  "windows-targets 0.48.5",
 ]
 
@@ -5895,6 +5869,15 @@ dependencies = [
  "windows-targets 0.48.5",
 ]
 
+[[package]]
+name = "windows-core"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9"
+dependencies = [
+ "windows-targets 0.52.0",
+]
+
 [[package]]
 name = "windows-sys"
 version = "0.48.0"
@@ -6029,9 +6012,9 @@ checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04"
 
 [[package]]
 name = "winnow"
-version = "0.5.27"
+version = "0.5.34"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cb877ca3232bec99a6472ed63f7241de2a250165260908b2d24c09d867907a85"
+checksum = "b7cf47b659b318dccbd69cc4797a39ae128f533dce7902a1096044d1967b9c16"
 dependencies = [
  "memchr",
 ]
@@ -6133,9 +6116,9 @@ checksum = "ec7a2a501ed189703dba8b08142f057e887dfc4b2cc4db2d343ac6376ba3e0b9"
 
 [[package]]
 name = "xxhash-rust"
-version = "0.8.7"
+version = "0.8.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9828b178da53440fa9c766a3d2f73f7cf5d0ac1fe3980c1e5018d899fd19e07b"
+checksum = "53be06678ed9e83edb1745eb72efc0bbcd7b5c3c35711a860906aed827a13d61"
 
 [[package]]
 name = "yazi"
@@ -6218,22 +6201,22 @@ checksum = "dd15f8e0dbb966fd9245e7498c7e9e5055d9e5c8b676b95bd67091cd11a1e697"
 
 [[package]]
 name = "zerocopy"
-version = "0.7.30"
+version = "0.7.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "306dca4455518f1f31635ec308b6b3e4eb1b11758cefafc782827d0aa7acb5c7"
+checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.7.30"
+version = "0.7.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be912bf68235a88fbefd1b73415cb218405958d1655b2ece9035a19920bdf6ba"
+checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.40",
+ "syn 2.0.48",
 ]
 
 [[package]]
diff --git a/Cargo.toml b/Cargo.toml
index daa7c4db..7abd8fe6 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -44,10 +44,10 @@ tracing-log = "0.2.0"
 lto = "thin"
 # lto = "fat"
 
-# [patch."https://github.com/pop-os/cosmic-time"]
-# cosmic-time = { path = "../cosmic-time" }
-# [patch."https://github.com/pop-os/libcosmic"]
-# libcosmic = { path = "../libcosmic" }
-# cosmic-config = { path = "../libcosmic/cosmic-config" }
+[patch."https://github.com/pop-os/cosmic-time"]
+cosmic-time = { path = "../cosmic-time" }
+[patch."https://github.com/pop-os/libcosmic"]
+libcosmic = { path = "../libcosmic" }
+cosmic-config = { path = "../libcosmic/cosmic-config" }
 [patch."https://github.com/Smithay/client-toolkit"]
 sctk = { git = "https://github.com/smithay/client-toolkit//", package = "smithay-client-toolkit", rev = "e63ab5f" }
diff --git a/cosmic-app-list/src/app.rs b/cosmic-app-list/src/app.rs
index bc1bc58c..375453d4 100755
--- a/cosmic-app-list/src/app.rs
+++ b/cosmic-app-list/src/app.rs
@@ -1158,16 +1158,11 @@ impl cosmic::Application for CosmicAppList {
                 _ => None,
             }),
             rectangle_tracker_subscription(0).map(|update| Message::Rectangle(update.1)),
-            cosmic_config::config_subscription(0, Cow::from(APP_ID), 1).map(|(_, config)| {
-                match config {
-                    Ok(config) => Message::ConfigUpdated(config),
-                    Err((errors, config)) => {
-                        for error in errors {
-                            log::error!("{:?}", error);
-                        }
-                        Message::ConfigUpdated(config)
-                    }
+            self.core.watch_config(APP_ID).map(|u| {
+                for err in u.errors {
+                    log::error!("Error watching config: {}", err);
                 }
+                Message::ConfigUpdated(u.config)
             }),
         ])
     }
diff --git a/cosmic-applet-audio/src/main.rs b/cosmic-applet-audio/src/main.rs
index b45cac69..96820bd7 100644
--- a/cosmic-applet-audio/src/main.rs
+++ b/cosmic-applet-audio/src/main.rs
@@ -43,7 +43,8 @@ mod pulse;
 
 const VERSION: &str = env!("CARGO_PKG_VERSION");
 
-pub fn main() -> cosmic::iced::Result {
+#[tokio::main(flavor = "current_thread")]
+pub async fn main() -> cosmic::iced::Result {
     tracing_subscriber::fmt::init();
     let _ = tracing_log::LogTracer::init();
 
@@ -560,19 +561,11 @@ impl cosmic::Application for Audio {
             self.timeline
                 .as_subscription()
                 .map(|(_, now)| Message::Frame(now)),
-            cosmic::cosmic_config::config_subscription(
-                0,
-                Self::APP_ID.into(),
-                AudioAppletConfig::version(),
-            )
-            .map(|(_, res)| match res {
-                Ok(c) => Message::ConfigChanged(c),
-                Err((errs, c)) => {
-                    for err in errs {
-                        tracing::error!("Error loading config: {}", err);
-                    }
-                    Message::ConfigChanged(c)
+            self.core.watch_config(Self::APP_ID.into()).map(|u| {
+                for err in u.errors {
+                    tracing::error!(?err, "Error watching config");
                 }
+                Message::ConfigChanged(u.config)
             }),
             mpris_subscription::mpris_subscription(0).map(Message::Mpris),
             activation_token_subscription(0).map(Message::Token),
diff --git a/cosmic-applet-audio/src/pulse.rs b/cosmic-applet-audio/src/pulse.rs
index 91d72ae6..ce52d071 100644
--- a/cosmic-applet-audio/src/pulse.rs
+++ b/cosmic-applet-audio/src/pulse.rs
@@ -196,7 +196,8 @@ impl PulseHandle {
                                             .send(Message::SetDefaultSink(sink))
                                             .await
                                         {
-                                            tracing::error!("ERROR! {:?}", err);
+                                            tracing::error!("ERROR! {}", err);
+                                            break;
                                         }
                                     }
                                     Err(_) => Self::send_disconnected(&from_pulse_send).await,
@@ -213,7 +214,8 @@ impl PulseHandle {
                                             .send(Message::SetDefaultSource(source))
                                             .await
                                         {
-                                            tracing::error!("ERROR! {:?}", err);
+                                            tracing::error!("ERROR! {}", err);
+                                            break;
                                         }
                                     }
                                     Err(e) => {
@@ -232,7 +234,8 @@ impl PulseHandle {
                                         if let Err(err) =
                                             from_pulse_send.send(Message::SetSinks(sinks)).await
                                         {
-                                            tracing::error!("ERROR! {:?}", err);
+                                            tracing::error!("ERROR! {}", err);
+                                            break;
                                         }
                                     }
                                     Err(_) => Self::send_disconnected(&from_pulse_send).await,
@@ -248,7 +251,8 @@ impl PulseHandle {
                                         if let Err(err) =
                                             from_pulse_send.send(Message::SetSources(sinks)).await
                                         {
-                                            tracing::error!("ERROR! {:?}", err);
+                                            tracing::error!("ERROR! {}", err);
+                                            break;
                                         }
                                     }
                                     Err(_) => Self::send_disconnected(&from_pulse_send).await,
diff --git a/cosmic-applet-workspaces/Cargo.toml b/cosmic-applet-workspaces/Cargo.toml
index ea2c5823..05b6f4d8 100644
--- a/cosmic-applet-workspaces/Cargo.toml
+++ b/cosmic-applet-workspaces/Cargo.toml
@@ -8,8 +8,8 @@ edition = "2021"
 libcosmic.workspace = true
 cctk.workspace = true
 cosmic-protocols.workspace = true
-nix = "0.26.1"
-log = "0.4"
+nix = "0.27.1"
+tracing = "0.1"
 tracing-subscriber.workspace = true
 tracing-log.workspace = true
 once_cell = "1.9"
diff --git a/cosmic-applet-workspaces/src/main.rs b/cosmic-applet-workspaces/src/main.rs
index aecc6969..72ea2131 100644
--- a/cosmic-applet-workspaces/src/main.rs
+++ b/cosmic-applet-workspaces/src/main.rs
@@ -5,8 +5,7 @@ mod localize;
 mod wayland;
 mod wayland_subscription;
 
-use config::APP_ID;
-use log::info;
+use tracing::info;
 
 use localize::localize;
 
diff --git a/debian/control b/debian/control
index d705c224..99068127 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: system76 <info@system76.com>
 Build-Depends:
   debhelper (>= 11),
   debhelper-compat (= 11),
-  rustc (=1.73.0),
+  rustc (>=1.73.0),
   cargo,
   libdbus-1-dev,
   libegl-dev,
diff --git a/rust-toolchain.toml b/rust-toolchain.toml
index 22fb8b20..a9aa3929 100644
--- a/rust-toolchain.toml
+++ b/rust-toolchain.toml
@@ -1,2 +1,2 @@
 [toolchain]
-channel = "1.73"
\ No newline at end of file
+channel = "1.75"
\ No newline at end of file

From e4f6242b983a337a01a71c7a251960bfe0b13dcf Mon Sep 17 00:00:00 2001
From: Ashley Wulber <ashley@system76.com>
Date: Thu, 18 Jan 2024 21:02:35 -0500
Subject: [PATCH 3/5] fix: make all subscriptions resistant to being restarted

many of the errors we've been seeing the last few days are because of subscriptions which are restarting
---
 Cargo.lock                                    |  30 ++++-
 Cargo.toml                                    |  10 +-
 cosmic-app-list/Cargo.toml                    |   1 +
 cosmic-app-list/src/app.rs                    |   2 +-
 cosmic-app-list/src/wayland_subscription.rs   |  64 ++++++-----
 cosmic-applet-audio/src/main.rs               |   3 +-
 cosmic-applet-audio/src/pulse.rs              | 108 ++++++++++--------
 cosmic-applet-notifications/src/main.rs       |  37 +++---
 .../src/subscriptions/notifications.rs        |   4 +-
 cosmic-applet-workspaces/Cargo.toml           |   1 +
 .../src/components/app.rs                     |   2 +-
 .../src/wayland_subscription.rs               |  60 +++++-----
 12 files changed, 184 insertions(+), 138 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 35cc8eda..d071de8f 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -768,6 +768,7 @@ dependencies = [
  "serde",
  "shlex",
  "tokio",
+ "tracing",
  "tracing-log",
  "tracing-subscriber",
  "url",
@@ -971,6 +972,7 @@ dependencies = [
  "nix 0.27.1",
  "once_cell",
  "rust-embed 6.8.1",
+ "tokio",
  "tracing",
  "tracing-log",
  "tracing-subscriber",
@@ -990,6 +992,7 @@ dependencies = [
 [[package]]
 name = "cosmic-config"
 version = "0.1.0"
+source = "git+https://github.com/pop-os/libcosmic#994e93d6d2f90f947d56376094eb19877d708063"
 dependencies = [
  "atomicwrites",
  "cosmic-config-derive",
@@ -1007,6 +1010,7 @@ dependencies = [
 [[package]]
 name = "cosmic-config-derive"
 version = "0.1.0"
+source = "git+https://github.com/pop-os/libcosmic#994e93d6d2f90f947d56376094eb19877d708063"
 dependencies = [
  "quote",
  "syn 1.0.109",
@@ -1094,7 +1098,7 @@ dependencies = [
 [[package]]
 name = "cosmic-text"
 version = "0.10.0"
-source = "git+https://github.com/pop-os/cosmic-text.git?branch=refactor#dd4c4cbbe2d5ed5046054b5361a6eeead50e0bb0"
+source = "git+https://github.com/pop-os/cosmic-text.git#6aadfaddac7ae68c3f97c0b9b2fa75033374a650"
 dependencies = [
  "bitflags 2.4.2",
  "fontdb",
@@ -1106,6 +1110,7 @@ dependencies = [
  "self_cell 1.0.3",
  "swash",
  "sys-locale",
+ "ttf-parser",
  "unicode-bidi",
  "unicode-linebreak",
  "unicode-script",
@@ -1115,6 +1120,7 @@ dependencies = [
 [[package]]
 name = "cosmic-theme"
 version = "0.1.0"
+source = "git+https://github.com/pop-os/libcosmic#994e93d6d2f90f947d56376094eb19877d708063"
 dependencies = [
  "almost",
  "cosmic-config",
@@ -1128,6 +1134,7 @@ dependencies = [
 [[package]]
 name = "cosmic-time"
 version = "0.4.0"
+source = "git+https://github.com/pop-os/cosmic-time#4dc1fcec44aa7471a8e707fa391f9882d23250d7"
 dependencies = [
  "float-cmp",
  "libcosmic",
@@ -2242,8 +2249,8 @@ dependencies = [
 
 [[package]]
 name = "glyphon"
-version = "0.3.0"
-source = "git+https://github.com/jackpot51/glyphon.git?branch=refactor#c28dc99c86b6b598633e6623096b21632f266976"
+version = "0.4.1"
+source = "git+https://github.com/jackpot51/glyphon.git#abb70c0fda8cf1a5dfc314c1c778103d7ba951e6"
 dependencies = [
  "cosmic-text",
  "etagere",
@@ -2538,6 +2545,7 @@ dependencies = [
 [[package]]
 name = "iced"
 version = "0.12.0"
+source = "git+https://github.com/pop-os/libcosmic#994e93d6d2f90f947d56376094eb19877d708063"
 dependencies = [
  "iced_accessibility",
  "iced_core",
@@ -2552,6 +2560,7 @@ dependencies = [
 [[package]]
 name = "iced_accessibility"
 version = "0.1.0"
+source = "git+https://github.com/pop-os/libcosmic#994e93d6d2f90f947d56376094eb19877d708063"
 dependencies = [
  "accesskit",
  "accesskit_unix",
@@ -2560,6 +2569,7 @@ dependencies = [
 [[package]]
 name = "iced_core"
 version = "0.12.0"
+source = "git+https://github.com/pop-os/libcosmic#994e93d6d2f90f947d56376094eb19877d708063"
 dependencies = [
  "bitflags 1.3.2",
  "iced_accessibility",
@@ -2577,6 +2587,7 @@ dependencies = [
 [[package]]
 name = "iced_futures"
 version = "0.12.0"
+source = "git+https://github.com/pop-os/libcosmic#994e93d6d2f90f947d56376094eb19877d708063"
 dependencies = [
  "futures",
  "iced_core",
@@ -2589,6 +2600,7 @@ dependencies = [
 [[package]]
 name = "iced_graphics"
 version = "0.12.0"
+source = "git+https://github.com/pop-os/libcosmic#994e93d6d2f90f947d56376094eb19877d708063"
 dependencies = [
  "bitflags 1.3.2",
  "bytemuck",
@@ -2611,6 +2623,7 @@ dependencies = [
 [[package]]
 name = "iced_renderer"
 version = "0.12.0"
+source = "git+https://github.com/pop-os/libcosmic#994e93d6d2f90f947d56376094eb19877d708063"
 dependencies = [
  "iced_graphics",
  "iced_tiny_skia",
@@ -2623,6 +2636,7 @@ dependencies = [
 [[package]]
 name = "iced_runtime"
 version = "0.12.0"
+source = "git+https://github.com/pop-os/libcosmic#994e93d6d2f90f947d56376094eb19877d708063"
 dependencies = [
  "iced_accessibility",
  "iced_core",
@@ -2634,6 +2648,7 @@ dependencies = [
 [[package]]
 name = "iced_sctk"
 version = "0.1.0"
+source = "git+https://github.com/pop-os/libcosmic#994e93d6d2f90f947d56376094eb19877d708063"
 dependencies = [
  "enum-repr",
  "float-cmp",
@@ -2657,6 +2672,7 @@ dependencies = [
 [[package]]
 name = "iced_style"
 version = "0.12.0"
+source = "git+https://github.com/pop-os/libcosmic#994e93d6d2f90f947d56376094eb19877d708063"
 dependencies = [
  "iced_core",
  "once_cell",
@@ -2666,6 +2682,7 @@ dependencies = [
 [[package]]
 name = "iced_tiny_skia"
 version = "0.12.0"
+source = "git+https://github.com/pop-os/libcosmic#994e93d6d2f90f947d56376094eb19877d708063"
 dependencies = [
  "bytemuck",
  "cosmic-text",
@@ -2683,6 +2700,7 @@ dependencies = [
 [[package]]
 name = "iced_wgpu"
 version = "0.12.0"
+source = "git+https://github.com/pop-os/libcosmic#994e93d6d2f90f947d56376094eb19877d708063"
 dependencies = [
  "bitflags 1.3.2",
  "bytemuck",
@@ -2702,6 +2720,7 @@ dependencies = [
 [[package]]
 name = "iced_widget"
 version = "0.12.0"
+source = "git+https://github.com/pop-os/libcosmic#994e93d6d2f90f947d56376094eb19877d708063"
 dependencies = [
  "iced_renderer",
  "iced_runtime",
@@ -2957,6 +2976,7 @@ checksum = "13e3bf6590cbc649f4d1a3eefc9d5d6eb746f5200ffb04e5e142700b8faa56e7"
 [[package]]
 name = "libcosmic"
 version = "0.1.0"
+source = "git+https://github.com/pop-os/libcosmic#994e93d6d2f90f947d56376094eb19877d708063"
 dependencies = [
  "apply",
  "ashpd",
@@ -3141,9 +3161,9 @@ dependencies = [
 
 [[package]]
 name = "lru"
-version = "0.11.1"
+version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4a83fb7698b3643a0e34f9ae6f2e8f0178c0fd42f8b59d493aa271ff3a5bf21"
+checksum = "2994eeba8ed550fd9b47a0b38f0242bc3344e496483c6180b69139cc2fa5d1d7"
 dependencies = [
  "hashbrown 0.14.3",
 ]
diff --git a/Cargo.toml b/Cargo.toml
index 7abd8fe6..0aae1ab7 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -44,10 +44,10 @@ tracing-log = "0.2.0"
 lto = "thin"
 # lto = "fat"
 
-[patch."https://github.com/pop-os/cosmic-time"]
-cosmic-time = { path = "../cosmic-time" }
-[patch."https://github.com/pop-os/libcosmic"]
-libcosmic = { path = "../libcosmic" }
-cosmic-config = { path = "../libcosmic/cosmic-config" }
+# [patch."https://github.com/pop-os/cosmic-time"]
+# cosmic-time = { path = "../cosmic-time" }
+# [patch."https://github.com/pop-os/libcosmic"]
+# libcosmic = { git = "https://github.com/pop-os/libcosmic//", branch = "refactor-config-watch" }
+# cosmic-config = { git = "https://github.com/pop-os/libcosmic//", branch = "refactor-config-watch" }
 [patch."https://github.com/Smithay/client-toolkit"]
 sctk = { git = "https://github.com/smithay/client-toolkit//", package = "smithay-client-toolkit", rev = "e63ab5f" }
diff --git a/cosmic-app-list/Cargo.toml b/cosmic-app-list/Cargo.toml
index 764b9026..c81225c2 100644
--- a/cosmic-app-list/Cargo.toml
+++ b/cosmic-app-list/Cargo.toml
@@ -16,6 +16,7 @@ once_cell = "1.9"
 xdg = "2.4"
 tracing-subscriber.workspace = true
 tracing-log.workspace = true
+tracing.workspace = true
 nix = "0.26"
 shlex = "1.1.0"
 anyhow = "1.0"
diff --git a/cosmic-app-list/src/app.rs b/cosmic-app-list/src/app.rs
index 375453d4..34c859c2 100755
--- a/cosmic-app-list/src/app.rs
+++ b/cosmic-app-list/src/app.rs
@@ -1122,7 +1122,7 @@ impl cosmic::Application for CosmicAppList {
 
     fn subscription(&self) -> Subscription<Message> {
         Subscription::batch(vec![
-            wayland_subscription(self.subscription_ctr).map(Message::Wayland),
+            wayland_subscription().map(Message::Wayland),
             listen_with(|e, _| match e {
                 cosmic::iced_runtime::core::Event::PlatformSpecific(
                     event::PlatformSpecific::Wayland(event::wayland::Event::Seat(e, seat)),
diff --git a/cosmic-app-list/src/wayland_subscription.rs b/cosmic-app-list/src/wayland_subscription.rs
index da9123cb..a348573e 100644
--- a/cosmic-app-list/src/wayland_subscription.rs
+++ b/cosmic-app-list/src/wayland_subscription.rs
@@ -11,29 +11,31 @@ use futures::{
     channel::mpsc::{unbounded, UnboundedReceiver},
     SinkExt, StreamExt,
 };
+use once_cell::sync::Lazy;
 use std::{fmt::Debug, hash::Hash, thread::JoinHandle};
+use tokio::sync::Mutex;
 
 use crate::wayland_handler::wayland_handler;
 
-pub fn wayland_subscription<I: 'static + Hash + Copy + Send + Sync + Debug>(
-    id: I,
-) -> iced::Subscription<WaylandUpdate> {
-    subscription::channel(id, 50, move |mut output| async move {
-        let mut state = State::Ready;
+pub static WAYLAND_RX: Lazy<Mutex<Option<UnboundedReceiver<WaylandUpdate>>>> =
+    Lazy::new(|| Mutex::new(None));
 
-        loop {
-            state = start_listening(state, &mut output).await;
-        }
-    })
+pub fn wayland_subscription() -> iced::Subscription<WaylandUpdate> {
+    subscription::channel(
+        std::any::TypeId::of::<WaylandUpdate>(),
+        50,
+        move |mut output| async move {
+            let mut state = State::Waiting;
+
+            loop {
+                state = start_listening(state, &mut output).await;
+            }
+        },
+    )
 }
 
 pub enum State {
-    Ready,
-    Waiting(
-        UnboundedReceiver<WaylandUpdate>,
-        calloop::channel::Sender<WaylandRequest>,
-        JoinHandle<()>,
-    ),
+    Waiting,
     Finished,
 }
 
@@ -42,28 +44,28 @@ async fn start_listening(
     output: &mut futures::channel::mpsc::Sender<WaylandUpdate>,
 ) -> State {
     match state {
-        State::Ready => {
-            let (calloop_tx, calloop_rx) = calloop::channel::channel();
-            let (toplevel_tx, toplevel_rx) = unbounded();
-            let handle = std::thread::spawn(move || {
-                wayland_handler(toplevel_tx, calloop_rx);
-            });
-            let tx = calloop_tx.clone();
-            _ = output.send(WaylandUpdate::Init(tx)).await;
-            State::Waiting(toplevel_rx, calloop_tx, handle)
-        }
-        State::Waiting(mut rx, tx, handle) => {
-            if handle.is_finished() {
-                _ = output.send(WaylandUpdate::Finished).await;
-                return State::Finished;
-            }
+        State::Waiting => {
+            let mut guard = WAYLAND_RX.lock().await;
+            let rx = {
+                if guard.is_none() {
+                    let (calloop_tx, calloop_rx) = calloop::channel::channel();
+                    let (toplevel_tx, toplevel_rx) = unbounded();
+                    let _ = std::thread::spawn(move || {
+                        wayland_handler(toplevel_tx, calloop_rx);
+                    });
+                    *guard = Some(toplevel_rx);
+                    _ = output.send(WaylandUpdate::Init(calloop_tx)).await;
+                }
+                guard.as_mut().unwrap()
+            };
             match rx.next().await {
                 Some(u) => {
                     _ = output.send(u).await;
-                    State::Waiting(rx, tx, handle)
+                    State::Waiting
                 }
                 None => {
                     _ = output.send(WaylandUpdate::Finished).await;
+                    tracing::error!("Wayland handler thread died");
                     State::Finished
                 }
             }
diff --git a/cosmic-applet-audio/src/main.rs b/cosmic-applet-audio/src/main.rs
index 96820bd7..95f52837 100644
--- a/cosmic-applet-audio/src/main.rs
+++ b/cosmic-applet-audio/src/main.rs
@@ -43,8 +43,7 @@ mod pulse;
 
 const VERSION: &str = env!("CARGO_PKG_VERSION");
 
-#[tokio::main(flavor = "current_thread")]
-pub async fn main() -> cosmic::iced::Result {
+pub fn main() -> cosmic::iced::Result {
     tracing_subscriber::fmt::init();
     let _ = tracing_log::LogTracer::init();
 
diff --git a/cosmic-applet-audio/src/pulse.rs b/cosmic-applet-audio/src/pulse.rs
index ce52d071..93e746f4 100644
--- a/cosmic-applet-audio/src/pulse.rs
+++ b/cosmic-applet-audio/src/pulse.rs
@@ -4,6 +4,7 @@ use std::{rc::Rc, thread};
 extern crate libpulse_binding as pulse;
 use cosmic::iced::{self, subscription};
 use cosmic::iced_futures::futures::{self, SinkExt};
+use cosmic_time::once_cell::sync::Lazy;
 //use futures::channel::mpsc;
 use libpulse_binding::{
     callbacks::ListResult,
@@ -16,6 +17,10 @@ use libpulse_binding::{
     proplist::Proplist,
     volume::ChannelVolumes,
 };
+use tokio::sync::{mpsc, Mutex};
+
+pub static FROM_PULSE: Lazy<Mutex<Option<(mpsc::Receiver<Message>, mpsc::Sender<Message>)>>> =
+    Lazy::new(|| Mutex::new(None));
 
 pub fn connect() -> iced::Subscription<Event> {
     struct SomeWorker;
@@ -24,7 +29,7 @@ pub fn connect() -> iced::Subscription<Event> {
         std::any::TypeId::of::<SomeWorker>(),
         50,
         move |mut output| async move {
-            let mut state = State::Init;
+            let mut state = State::Connecting;
 
             loop {
                 state = start_listening(state, &mut output).await;
@@ -38,34 +43,50 @@ async fn start_listening(
     output: &mut futures::channel::mpsc::Sender<Event>,
 ) -> State {
     match state {
-        State::Init => {
-            let PulseHandle {
-                to_pulse,
-                from_pulse,
-            } = PulseHandle::new();
-            _ = output.send(Event::Init(Connection(to_pulse))).await;
-
-            State::Connecting(from_pulse)
-        }
         // Waiting for Connection to succeed
-        State::Connecting(mut from_pulse) => match from_pulse.recv().await {
-            Some(Message::Connected) => {
-                _ = output.send(Event::Connected).await;
-                State::Connected(from_pulse)
-            }
-            Some(Message::Disconnected) => {
-                _ = output.send(Event::Disconnected).await;
+        State::Connecting => {
+            let mut guard = FROM_PULSE.lock().await;
+            let (from_pulse, to_pulse) = {
+                if guard.is_none() {
+                    let PulseHandle {
+                        to_pulse,
+                        from_pulse,
+                    } = PulseHandle::new();
+                    _ = output.send(Event::Init(Connection(to_pulse.clone()))).await;
+
+                    *guard = Some((from_pulse, to_pulse));
+                }
+                guard.as_mut().unwrap()
+            };
+            to_pulse
+                .send(Message::UpdateConnection)
+                .await
+                .expect("Failed to request connection update");
 
-                State::Connecting(from_pulse)
-            }
-            Some(m) => {
-                panic!("Unexpected message: {:?}", m);
-            }
-            None => {
-                panic!("Pulse Sender dropped, something has gone wrong!");
+            match from_pulse.recv().await {
+                Some(Message::Connected) => {
+                    _ = output.send(Event::Connected).await;
+                    State::Connected
+                }
+                Some(Message::Disconnected) => {
+                    _ = output.send(Event::Disconnected).await;
+
+                    State::Connecting
+                }
+                Some(m) => {
+                    tracing::error!("Unexpected message: {:?}", m);
+                    State::Connecting
+                }
+                None => {
+                    panic!("Pulse Sender dropped, something has gone wrong!");
+                }
             }
-        },
-        State::Connected(mut from_pulse) => {
+        }
+        State::Connected => {
+            let mut guard = FROM_PULSE.lock().await;
+            let Some((from_pulse, _)) = guard.as_mut() else {
+                return State::Connecting;
+            };
             // This is where we match messages from the pulse server to pass to the gui
             match from_pulse.recv().await {
                 Some(Message::SetSinks(sinks)) => {
@@ -73,35 +94,35 @@ async fn start_listening(
                         .send(Event::MessageReceived(Message::SetSinks(sinks)))
                         .await;
 
-                    State::Connected(from_pulse)
+                    State::Connected
                 }
                 Some(Message::SetSources(sources)) => {
                     _ = output
                         .send(Event::MessageReceived(Message::SetSources(sources)))
                         .await;
-                    State::Connected(from_pulse)
+                    State::Connected
                 }
                 Some(Message::SetDefaultSink(sink)) => {
                     _ = output
                         .send(Event::MessageReceived(Message::SetDefaultSink(sink)))
                         .await;
-                    State::Connected(from_pulse)
+                    State::Connected
                 }
                 Some(Message::SetDefaultSource(source)) => {
                     _ = output
                         .send(Event::MessageReceived(Message::SetDefaultSource(source)))
                         .await;
-                    State::Connected(from_pulse)
+                    State::Connected
                 }
                 Some(Message::Disconnected) => {
                     _ = output.send(Event::Disconnected).await;
-                    State::Connecting(from_pulse)
+                    State::Connecting
                 }
                 None => {
                     _ = output.send(Event::Disconnected).await;
-                    State::Connecting(from_pulse)
+                    State::Connecting
                 }
-                _ => State::Connected(from_pulse),
+                _ => State::Connected,
             }
         }
     }
@@ -109,9 +130,8 @@ async fn start_listening(
 
 // #[derive(Debug)]
 enum State {
-    Init,
-    Connecting(tokio::sync::mpsc::Receiver<Message>),
-    Connected(tokio::sync::mpsc::Receiver<Message>),
+    Connecting,
+    Connected,
 }
 
 #[derive(Debug, Clone)]
@@ -123,7 +143,7 @@ pub enum Event {
 }
 
 #[derive(Debug, Clone)]
-pub struct Connection(tokio::sync::mpsc::Sender<Message>);
+pub struct Connection(mpsc::Sender<Message>);
 
 impl Connection {
     pub fn send(&mut self, message: Message) {
@@ -160,10 +180,7 @@ impl PulseHandle {
     pub fn new() -> Self {
         let (to_pulse, mut to_pulse_recv) = tokio::sync::mpsc::channel(10);
         let (from_pulse_send, from_pulse) = tokio::sync::mpsc::channel(10);
-        // get initial connection status
-        to_pulse
-            .try_send(Message::UpdateConnection)
-            .expect("Failed to send initial connection update message");
+
         // this thread should complete by pushing a completed message,
         // or fail message. This should never complete/fail without pushing
         // a message. This lets the iced subscription go to sleep while init
@@ -197,7 +214,6 @@ impl PulseHandle {
                                             .await
                                         {
                                             tracing::error!("ERROR! {}", err);
-                                            break;
                                         }
                                     }
                                     Err(_) => Self::send_disconnected(&from_pulse_send).await,
@@ -215,7 +231,6 @@ impl PulseHandle {
                                             .await
                                         {
                                             tracing::error!("ERROR! {}", err);
-                                            break;
                                         }
                                     }
                                     Err(e) => {
@@ -235,7 +250,6 @@ impl PulseHandle {
                                             from_pulse_send.send(Message::SetSinks(sinks)).await
                                         {
                                             tracing::error!("ERROR! {}", err);
-                                            break;
                                         }
                                     }
                                     Err(_) => Self::send_disconnected(&from_pulse_send).await,
@@ -252,7 +266,6 @@ impl PulseHandle {
                                             from_pulse_send.send(Message::SetSources(sinks)).await
                                         {
                                             tracing::error!("ERROR! {}", err);
-                                            break;
                                         }
                                     }
                                     Err(_) => Self::send_disconnected(&from_pulse_send).await,
@@ -278,13 +291,13 @@ impl PulseHandle {
                                     server.is_some()
                                 );
                                 if let Some(mut cur_server) = server.take() {
-                                    tracing::trace!("getting server info...");
                                     if cur_server.get_server_info().is_err() {
                                         tracing::warn!("got error, server must be disconnected...");
                                         Self::send_disconnected(&from_pulse_send).await;
                                     } else {
-                                        tracing::trace!("got server info, still connected...");
+                                        tracing::info!("got server info, still connected...");
                                         server = Some(cur_server);
+                                        Self::send_connected(&from_pulse_send).await;
                                     }
                                 } else {
                                     match PulseServer::connect().and_then(|server| server.init()) {
@@ -298,6 +311,7 @@ impl PulseHandle {
                                                 "Failed to connect to server: {:?}",
                                                 err
                                             );
+                                            Self::send_disconnected(&from_pulse_send).await;
                                         }
                                     }
                                 }
diff --git a/cosmic-applet-notifications/src/main.rs b/cosmic-applet-notifications/src/main.rs
index 32a90412..f4cc61cf 100644
--- a/cosmic-applet-notifications/src/main.rs
+++ b/cosmic-applet-notifications/src/main.rs
@@ -15,6 +15,7 @@ use cosmic::iced::{
 use cosmic::iced_core::alignment::Horizontal;
 use cosmic::Command;
 
+use cosmic::iced_futures::futures::executor::block_on;
 use cosmic::iced_style::application;
 
 use cosmic::iced_widget::{scrollable, Column};
@@ -26,11 +27,11 @@ use cosmic_time::{anim, chain, id, once_cell::sync::Lazy, Instant, Timeline};
 use std::borrow::Cow;
 use std::collections::HashMap;
 use std::path::PathBuf;
+use subscriptions::notifications::NotificationsAppletProxy;
 use tokio::sync::mpsc::Sender;
 use tracing::info;
 
-#[tokio::main(flavor = "current_thread")]
-pub async fn main() -> cosmic::iced::Result {
+pub fn main() -> cosmic::iced::Result {
     tracing_subscriber::fmt::init();
     let _ = tracing_log::LogTracer::init();
     // Prepare i18n
@@ -43,7 +44,6 @@ pub async fn main() -> cosmic::iced::Result {
 
 static DO_NOT_DISTURB: Lazy<id::Toggler> = Lazy::new(id::Toggler::unique);
 
-#[derive(Default)]
 struct Notifications {
     core: cosmic::app::Core,
     config: NotificationsConfig,
@@ -55,6 +55,7 @@ struct Notifications {
     dbus_sender: Option<Sender<subscriptions::dbus::Input>>,
     cards: Vec<(id::Cards, Vec<Notification>, bool, String, String, String)>,
     token_tx: Option<calloop::channel::Sender<TokenRequest>>,
+    proxy: NotificationsAppletProxy<'static>,
 }
 
 impl Notifications {
@@ -132,7 +133,14 @@ impl cosmic::Application for Notifications {
             core,
             config_helper: helper,
             config,
-            ..Default::default()
+            icon_name: Default::default(),
+            popup: None,
+            timeline: Default::default(),
+            dbus_sender: Default::default(),
+            cards: Vec::new(),
+            token_tx: Default::default(),
+            proxy: block_on(crate::subscriptions::notifications::get_proxy())
+                .expect("Failed to get proxy"),
         };
         _self.update_icon();
         (_self, Command::none())
@@ -152,25 +160,20 @@ impl cosmic::Application for Notifications {
 
     fn subscription(&self) -> Subscription<Message> {
         Subscription::batch(vec![
-            config_subscription::<u64, NotificationsConfig>(
-                0,
-                cosmic_notifications_config::ID.into(),
-                NotificationsConfig::version(),
-            )
-            .map(|(_, res)| match res {
-                Ok(config) => Message::Config(config),
-                Err((errors, config)) => {
-                    for err in errors {
+            self.core
+                .watch_config(cosmic_notifications_config::ID.into())
+                .map(|res| {
+                    for err in res.errors {
                         tracing::error!("{:?}", err);
                     }
-                    Message::Config(config)
-                }
-            }),
+                    Message::Config(res.config)
+                }),
             self.timeline
                 .as_subscription()
                 .map(|(_, now)| Message::Frame(now)),
             subscriptions::dbus::proxy().map(Message::DbusEvent),
-            subscriptions::notifications::notifications().map(Message::NotificationEvent),
+            subscriptions::notifications::notifications(self.proxy.clone())
+                .map(Message::NotificationEvent),
             activation_token_subscription(0).map(Message::Token),
         ])
     }
diff --git a/cosmic-applet-notifications/src/subscriptions/notifications.rs b/cosmic-applet-notifications/src/subscriptions/notifications.rs
index 8b2d9a13..09e3f53b 100644
--- a/cosmic-applet-notifications/src/subscriptions/notifications.rs
+++ b/cosmic-applet-notifications/src/subscriptions/notifications.rs
@@ -22,7 +22,7 @@ pub enum State {
     Finished,
 }
 
-pub fn notifications() -> Subscription<Notification> {
+pub fn notifications(proxy: NotificationsAppletProxy<'static>) -> Subscription<Notification> {
     struct SomeWorker;
 
     subscription::channel(
@@ -107,7 +107,7 @@ trait NotificationsApplet {
     ) -> zbus::Result<()>;
 }
 
-async fn get_proxy() -> anyhow::Result<NotificationsAppletProxy<'static>> {
+pub async fn get_proxy() -> anyhow::Result<NotificationsAppletProxy<'static>> {
     let raw_fd = std::env::var("COSMIC_NOTIFICATIONS")?;
     let raw_fd = raw_fd.parse::<RawFd>()?;
 
diff --git a/cosmic-applet-workspaces/Cargo.toml b/cosmic-applet-workspaces/Cargo.toml
index 05b6f4d8..1de199af 100644
--- a/cosmic-applet-workspaces/Cargo.toml
+++ b/cosmic-applet-workspaces/Cargo.toml
@@ -16,6 +16,7 @@ once_cell = "1.9"
 futures = "0.3.21"
 xdg = "2.4.0"
 anyhow = "1.0"
+tokio = "1.35"
 # Application i18n
 i18n-embed = { version = "0.13.4", features = ["fluent-system", "desktop-requester"] }
 i18n-embed-fl = "0.6.4"
diff --git a/cosmic-applet-workspaces/src/components/app.rs b/cosmic-applet-workspaces/src/components/app.rs
index 2f440638..0dac88be 100644
--- a/cosmic-applet-workspaces/src/components/app.rs
+++ b/cosmic-applet-workspaces/src/components/app.rs
@@ -222,7 +222,7 @@ impl cosmic::Application for IcedWorkspacesApplet {
 
     fn subscription(&self) -> Subscription<Message> {
         Subscription::batch(vec![
-            workspaces(0).map(Message::WorkspaceUpdate),
+            workspaces().map(Message::WorkspaceUpdate),
             event::listen_with(|e, _| match e {
                 Mouse(mouse::Event::WheelScrolled { delta }) => Some(Message::WheelScrolled(delta)),
                 _ => None,
diff --git a/cosmic-applet-workspaces/src/wayland_subscription.rs b/cosmic-applet-workspaces/src/wayland_subscription.rs
index 4b45a7b4..d3d91db4 100644
--- a/cosmic-applet-workspaces/src/wayland_subscription.rs
+++ b/cosmic-applet-workspaces/src/wayland_subscription.rs
@@ -5,7 +5,11 @@ use cosmic::iced::{
     futures::{channel::mpsc, SinkExt, StreamExt},
     subscription,
 };
-use std::hash::Hash;
+use once_cell::sync::Lazy;
+use tokio::sync::Mutex;
+
+pub static WAYLAND_RX: Lazy<Mutex<Option<mpsc::Receiver<WorkspaceList>>>> =
+    Lazy::new(|| Mutex::new(None));
 
 #[derive(Debug, Clone)]
 pub enum WorkspacesUpdate {
@@ -14,16 +18,18 @@ pub enum WorkspacesUpdate {
     Errored,
 }
 
-pub fn workspaces<I: 'static + Hash + Copy + Send + Sync>(
-    id: I,
-) -> iced::Subscription<WorkspacesUpdate> {
-    subscription::channel(id, 50, move |mut output| async move {
-        let mut state = State::Ready;
+pub fn workspaces() -> iced::Subscription<WorkspacesUpdate> {
+    subscription::channel(
+        std::any::TypeId::of::<WorkspacesUpdate>(),
+        50,
+        move |mut output| async move {
+            let mut state = State::Waiting;
 
-        loop {
-            state = start_listening(state, &mut output).await;
-        }
-    })
+            loop {
+                state = start_listening(state, &mut output).await;
+            }
+        },
+    )
 }
 
 async fn start_listening(
@@ -31,22 +37,23 @@ async fn start_listening(
     output: &mut futures::channel::mpsc::Sender<WorkspacesUpdate>,
 ) -> State {
     match state {
-        State::Ready => {
-            if let Ok(watcher) = WorkspacesWatcher::new() {
-                _ = output
-                    .send(WorkspacesUpdate::Started(watcher.get_sender()))
-                    .await;
-                State::Waiting(watcher)
-            } else {
-                _ = output.send(WorkspacesUpdate::Errored).await;
-
-                State::Error
-            }
-        }
-        State::Waiting(mut t) => {
-            if let Some(w) = t.workspaces().await {
+        State::Waiting => {
+            let mut guard = WAYLAND_RX.lock().await;
+            let rx = {
+                if guard.is_none() {
+                    if let Ok(WorkspacesWatcher { rx, tx }) = WorkspacesWatcher::new() {
+                        *guard = Some(rx);
+                        _ = output.send(WorkspacesUpdate::Started(tx)).await;
+                    } else {
+                        _ = output.send(WorkspacesUpdate::Errored).await;
+                        return State::Error;
+                    }
+                }
+                guard.as_mut().unwrap()
+            };
+            if let Some(w) = rx.next().await {
                 _ = output.send(WorkspacesUpdate::Workspaces(w)).await;
-                State::Waiting(t)
+                State::Waiting
             } else {
                 _ = output.send(WorkspacesUpdate::Errored).await;
                 State::Error
@@ -57,8 +64,7 @@ async fn start_listening(
 }
 
 pub enum State {
-    Ready,
-    Waiting(WorkspacesWatcher),
+    Waiting,
     Error,
 }
 

From 42915de6647cc9871ef98434b16d898f32872613 Mon Sep 17 00:00:00 2001
From: Ashley Wulber <ashley@system76.com>
Date: Thu, 18 Jan 2024 21:19:18 -0500
Subject: [PATCH 4/5] fix: use the correct version of app list config

---
 cosmic-app-list/src/app.rs    | 14 ++++++++------
 cosmic-app-list/src/config.rs |  2 +-
 cosmic-app-list/src/main.rs   |  5 ++---
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/cosmic-app-list/src/app.rs b/cosmic-app-list/src/app.rs
index 34c859c2..57b8c176 100755
--- a/cosmic-app-list/src/app.rs
+++ b/cosmic-app-list/src/app.rs
@@ -398,7 +398,7 @@ impl cosmic::Application for CosmicAppList {
         core: cosmic::app::Core,
         _flags: Self::Flags,
     ) -> (Self, iced::Command<cosmic::app::Message<Self::Message>>) {
-        let config = Config::new(APP_ID, 1)
+        let config = Config::new(APP_ID, AppListConfig::VERSION)
             .ok()
             .and_then(|c| AppListConfig::get_entry(&c).ok())
             .unwrap_or_default();
@@ -485,14 +485,16 @@ impl cosmic::Application for CosmicAppList {
                 }
 
                 self.config
-                    .add_favorite(id, &Config::new(APP_ID, 1).unwrap());
+                    .add_favorite(id, &Config::new(APP_ID, AppListConfig::VERSION).unwrap());
                 if let Some((popup_id, _toplevel)) = self.popup.take() {
                     return destroy_popup(popup_id);
                 }
             }
             Message::UnFavorite(id) => {
-                self.config
-                    .remove_favorite(id.clone(), &Config::new(APP_ID, 1).unwrap());
+                self.config.remove_favorite(
+                    id.clone(),
+                    &Config::new(APP_ID, AppListConfig::VERSION).unwrap(),
+                );
                 if let Some(i) = self
                     .favorite_list
                     .iter()
@@ -555,7 +557,7 @@ impl cosmic::Application for CosmicAppList {
                             let t = self.favorite_list.remove(pos);
                             self.config.remove_favorite(
                                 t.desktop_info.id.clone(),
-                                &Config::new(APP_ID, 1).unwrap(),
+                                &Config::new(APP_ID, AppListConfig::VERSION).unwrap(),
                             );
                             Some((true, t))
                         } else {
@@ -706,7 +708,7 @@ impl cosmic::Application for CosmicAppList {
                             .iter()
                             .map(|dock_item| dock_item.desktop_info.id.clone())
                             .collect(),
-                        &Config::new(APP_ID, 1).unwrap(),
+                        &Config::new(APP_ID, AppListConfig::VERSION).unwrap(),
                     );
                 }
                 return finish_dnd();
diff --git a/cosmic-app-list/src/config.rs b/cosmic-app-list/src/config.rs
index c5025e1b..5b34acc7 100644
--- a/cosmic-app-list/src/config.rs
+++ b/cosmic-app-list/src/config.rs
@@ -3,7 +3,6 @@ use cosmic::cosmic_config::{self, Config, CosmicConfigEntry};
 use serde::{Deserialize, Serialize};
 use std::fmt::Debug;
 pub const APP_ID: &str = "com.system76.CosmicAppList";
-pub const VERSION: &str = "0.1.0";
 
 #[derive(Debug, Clone, Deserialize, Serialize, Default, PartialEq, Eq)]
 pub enum TopLevelFilter {
@@ -13,6 +12,7 @@ pub enum TopLevelFilter {
 }
 
 #[derive(Debug, Clone, Default, Deserialize, Serialize, PartialEq, Eq, CosmicConfigEntry)]
+#[version = 1]
 pub struct AppListConfig {
     pub filter_top_levels: Option<TopLevelFilter>,
     pub favorites: Vec<String>,
diff --git a/cosmic-app-list/src/main.rs b/cosmic-app-list/src/main.rs
index e46afc57..ad175a8e 100644
--- a/cosmic-app-list/src/main.rs
+++ b/cosmic-app-list/src/main.rs
@@ -10,14 +10,13 @@ use log::info;
 
 use localize::localize;
 
-use crate::config::{APP_ID, VERSION};
+pub const VERSION: &str = env!("CARGO_PKG_VERSION");
 
 fn main() -> cosmic::iced::Result {
     // Initialize logger
     tracing_subscriber::fmt::init();
     let _ = tracing_log::LogTracer::init();
-    info!("Iced Workspaces Applet ({})", APP_ID);
-    info!("Version: {}", VERSION);
+    info!("Iced Workspaces Applet ({VERSION})");
     // Prepare i18n
     localize();
 

From 9037656d428c6acf0657fe97f16f1f30509bdcfb Mon Sep 17 00:00:00 2001
From: Ashley Wulber <ashley@system76.com>
Date: Thu, 18 Jan 2024 22:13:05 -0500
Subject: [PATCH 5/5] fix(notifications): only connect to notifications daemon
 once

---
 cosmic-applet-notifications/src/main.rs         |  2 +-
 .../src/subscriptions/notifications.rs          | 17 ++++-------------
 2 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/cosmic-applet-notifications/src/main.rs b/cosmic-applet-notifications/src/main.rs
index f4cc61cf..425ebb3c 100644
--- a/cosmic-applet-notifications/src/main.rs
+++ b/cosmic-applet-notifications/src/main.rs
@@ -5,7 +5,7 @@ use cosmic::applet::token::subscription::{
 };
 use cosmic::applet::{menu_button, menu_control_padding, padded_control};
 use cosmic::cctk::sctk::reexports::calloop;
-use cosmic::cosmic_config::{config_subscription, Config, CosmicConfigEntry};
+use cosmic::cosmic_config::{Config, CosmicConfigEntry};
 use cosmic::iced::wayland::popup::{destroy_popup, get_popup};
 use cosmic::iced::Limits;
 use cosmic::iced::{
diff --git a/cosmic-applet-notifications/src/subscriptions/notifications.rs b/cosmic-applet-notifications/src/subscriptions/notifications.rs
index 09e3f53b..e1d6ecdc 100644
--- a/cosmic-applet-notifications/src/subscriptions/notifications.rs
+++ b/cosmic-applet-notifications/src/subscriptions/notifications.rs
@@ -17,8 +17,7 @@ use zbus::{
 
 #[derive(Debug)]
 pub enum State {
-    Ready,
-    WaitingForNotificationEvent(NotificationsAppletProxy<'static>, u8),
+    WaitingForNotificationEvent(u8),
     Finished,
 }
 
@@ -29,20 +28,11 @@ pub fn notifications(proxy: NotificationsAppletProxy<'static>) -> Subscription<N
         std::any::TypeId::of::<SomeWorker>(),
         50,
         |mut output| async move {
-            let mut state = State::Ready;
+            let mut state = State::WaitingForNotificationEvent(0);
 
             loop {
                 match &mut state {
-                    State::Ready => {
-                        state = match get_proxy().await {
-                            Ok(p) => State::WaitingForNotificationEvent(p, 0),
-                            Err(err) => {
-                                error!("Failed to connect to notifications daemon {}", err);
-                                State::Finished
-                            }
-                        };
-                    }
-                    State::WaitingForNotificationEvent(proxy, mut fail_count) => {
+                    State::WaitingForNotificationEvent(mut fail_count) => {
                         trace!("Waiting for notification events...");
                         let mut signal = match proxy.receive_notify().await {
                             Ok(s) => s,
@@ -110,6 +100,7 @@ trait NotificationsApplet {
 pub async fn get_proxy() -> anyhow::Result<NotificationsAppletProxy<'static>> {
     let raw_fd = std::env::var("COSMIC_NOTIFICATIONS")?;
     let raw_fd = raw_fd.parse::<RawFd>()?;
+    tracing::info!("Connecting to notifications daemon on fd {}", raw_fd);
 
     let stream = unsafe { std::os::unix::net::UnixStream::from_raw_fd(raw_fd) };
     stream.set_nonblocking(true)?;