diff --git a/Cargo.toml b/Cargo.toml index 3cba6ce9..8b7a2b3c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -65,21 +65,21 @@ xdg-portal = ["ashpd"] [dependencies] apply = "0.3.0" -ashpd = { version = "0.7.0", default-features = false, optional = true } +ashpd = { version = "0.8.1", default-features = false, optional = true } async-fs = { version = "2.1", optional = true } cctk = { git = "https://github.com/pop-os/cosmic-protocols", package = "cosmic-client-toolkit", rev = "e4e6f8c", optional = true } chrono = "0.4.35" cosmic-config = { path = "cosmic-config" } -cosmic-settings-daemon = { git = "https://github.com/pop-os/dbus-settings-bindings", branch = "cosmic-settings-daemon", optional = true } +cosmic-settings-daemon = { git = "https://github.com/pop-os/dbus-settings-bindings", optional = true } css-color = "0.2.5" derive_setters = "0.1.5" fraction = "0.14.0" -image = { version = "0.24.6", optional = true } +image = { version = "0.25.1", optional = true } lazy_static = "1.4.0" mime = { version = "0.3.17", optional = true } nix = { version = "0.27", features = ["process"], optional = true } palette = "0.7.3" -rfd = { version = "0.13.0", optional = true } +rfd = { version = "0.14.0", optional = true } serde = { version = "1.0.180", optional = true } slotmap = "1.0.6" thiserror = "1.0.44" @@ -87,7 +87,7 @@ tokio = { version = "1.24.2", optional = true } tracing = "0.1" unicode-segmentation = "1.6" url = "2.4.0" -zbus = { version = "3.14.1", default-features = false, optional = true } +zbus = { version = "4.2.1", default-features = false, optional = true } [target.'cfg(unix)'.dependencies] freedesktop-icons = "0.2.5" diff --git a/cosmic-config/Cargo.toml b/cosmic-config/Cargo.toml index 7dcf2c21..3699e889 100644 --- a/cosmic-config/Cargo.toml +++ b/cosmic-config/Cargo.toml @@ -10,7 +10,8 @@ macro = ["cosmic-config-derive"] subscription = ["iced_futures"] [dependencies] -zbus = { version = "3.14.1", default-features = false, optional = true } +cosmic-settings-daemon = { git = "https://github.com/pop-os/dbus-settings-bindings", optional = true } +zbus = { version = "4.2.1", default-features = false, optional = true } atomicwrites = { git = "https://github.com/jackpot51/rust-atomicwrites" } calloop = { version = "0.13.0", optional = true } notify = "6.0.0" @@ -20,7 +21,6 @@ cosmic-config-derive = { path = "../cosmic-config-derive/", optional = true } iced = { path = "../iced/", default-features = false, optional = true } iced_futures = { path = "../iced/futures/", default-features = false, optional = true } once_cell = "1.19.0" -cosmic-settings-daemon = { git = "https://github.com/pop-os/dbus-settings-bindings", branch = "cosmic-settings-daemon", optional = true } futures-util = { version = "0.3", optional = true } dirs.workspace = true tokio = { version = "1.0", optional = true, features = ["time"] } diff --git a/cosmic-config/src/dbus.rs b/cosmic-config/src/dbus.rs index 28ac8844..a36d49db 100644 --- a/cosmic-config/src/dbus.rs +++ b/cosmic-config/src/dbus.rs @@ -29,7 +29,7 @@ impl Watcher { version: u64, ) -> zbus::Result { let (path, name) = settings_daemon_proxy.watch_config(id, version).await?; - ConfigProxy::builder(settings_daemon_proxy.connection()) + ConfigProxy::builder(settings_daemon_proxy.inner().connection()) .path(path)? .destination(name)? .build() @@ -43,7 +43,7 @@ impl Watcher { version: u64, ) -> zbus::Result { let (path, name) = settings_daemon_proxy.watch_state(id, version).await?; - ConfigProxy::builder(settings_daemon_proxy.connection()) + ConfigProxy::builder(settings_daemon_proxy.inner().connection()) .path(path)? .destination(name)? .build() @@ -140,7 +140,7 @@ pub fn watcher_subscription( @@ -221,7 +221,7 @@ impl DbusActivation { } #[cfg(feature = "single-instance")] -#[dbus_proxy(interface = "org.freedesktop.DbusActivation", assume_defaults = true)] +#[proxy(interface = "org.freedesktop.DbusActivation", assume_defaults = true)] pub trait DbusActivationInterface { /// Activate the application. fn activate(&mut self, platform_data: HashMap<&str, Value<'_>>) -> zbus::Result<()>; @@ -243,7 +243,7 @@ pub trait DbusActivationInterface { } #[cfg(feature = "single-instance")] -#[dbus_interface(name = "org.freedesktop.DbusActivation")] +#[interface(name = "org.freedesktop.DbusActivation")] impl DbusActivation { async fn activate(&mut self, platform_data: HashMap<&str, Value<'_>>) { if let Some(tx) = &mut self.0 {