Merge branch 'talonvoice/zbus' into zbus

iovxw · Feb 12, 2024 · 7481bd8 · 7481bd8
2 parents 115e8dd + ce8017c
commit 7481bd8
Show file tree

Hide file tree

Showing 11 changed files with 741 additions and 904 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -12,9 +12,8 @@ categories = ["api-bindings"]
 license = "Unlicense"
 
 [dependencies]
-dbus = { version = "0.9" }
-dbus-tree = { version = "0.9" }
-thiserror = "1.0"
-
-[build-dependencies]
-dbus-codegen = { version = "0.9" }
+futures = { version = "0.3.28", default-features = false }
+serde = { version = "1.0.188", features = ["derive"] }
+thiserror = "1.0.47"
+tokio = { version = "1.32.0", features = ["rt", "macros"] }
+zbus = { version = "3.14.1", features = ["tokio"], default-features = false }
diff --git a/build.rs b/build.rs
diff --git a/examples/example.rs b/examples/example.rs
@@ -91,16 +91,14 @@ impl ksni::Tray for MyTray {
 }
 
 fn main() {
-    let service = ksni::TrayService::new(MyTray {
+    let handle = ksni::spawn(MyTray {
         selected_option: 0,
         checked: false,
-    });
-    let handle = service.handle();
-    service.spawn();
+    }).unwrap();
 
     std::thread::sleep(std::time::Duration::from_secs(5));
     // We can modify the handle
-    handle.update(|tray: &mut MyTray| {
+    let _ = handle.update(|tray: &mut MyTray| {
         tray.checked = true;
     });
     // Run forever

diff --git a/src/dbus_ext.rs b/src/dbus_ext.rs