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

chore: update zbus

Browse source
This commit is contained in:
Ashley Wulber 2024-05-16 15:36:53 -04:00 • committed by Michael Murphy
parent 54eb5487b4
commit 78a137214d
4 changed files with 13 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

4
cosmic-config/Cargo.toml
View file

@ -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"] }

6
cosmic-config/src/dbus.rs
View file

@ -29,7 +29,7 @@ impl Watcher {
version: u64,
) -> zbus::Result<Self> {
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<Self> {
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<T: CosmicConfigEntry + Send + Sync + Default + 'stat
let mut changes = changes.map(Change::Changes).fuse();
let Ok(owner_changed) = watcher.receive_owner_changed().await else {
let Ok(owner_changed) = watcher.inner().receive_owner_changed().await else {
tracing::error!("Failed to listen for owner changes for {config_id}");
#[cfg(feature = "tokio")]
::tokio::time::sleep(::tokio::time::Duration::from_secs(2_u64.pow(attempts))).await;