zbus: move to non-deprecated attribute macros

ErikReider · Sep 14, 2024 · 361ea7c · 361ea7c
1 parent dbb8b72
commit 361ea7c
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/src/client/main.rs b/src/client/main.rs
@@ -15,9 +15,9 @@ use gtk::{gio::ApplicationFlags, Application};
 use gtk::{glib, prelude::*};
 use std::env::args_os;
 use std::path::PathBuf;
-use zbus::{blocking::Connection, dbus_proxy};
+use zbus::{blocking::Connection, proxy};
 
-#[dbus_proxy(
+#[proxy(
 	interface = "org.erikreider.swayosd",
 	default_service = "org.erikreider.swayosd-server",
 	default_path = "/org/erikreider/swayosd"

diff --git a/src/input-backend/dbus_server.rs b/src/input-backend/dbus_server.rs
@@ -1,12 +1,12 @@
-use zbus::{dbus_interface, Connection, ConnectionBuilder, SignalContext};
+use zbus::{interface, Connection, ConnectionBuilder, SignalContext};
 
 use crate::config::{DBUS_BACKEND_NAME, DBUS_PATH};
 
 pub struct DbusServer;
 
-#[dbus_interface(name = "org.erikreider.swayosd")]
+#[interface(name = "org.erikreider.swayosd")]
 impl DbusServer {
-	#[dbus_interface(signal)]
+	#[zbus(signal)]
 	pub async fn key_pressed(
 		signal_ctxt: &SignalContext<'_>,
 		key_code: u16,

diff --git a/src/server/main.rs b/src/server/main.rs
@@ -35,13 +35,13 @@ use std::future::pending;
 use std::path::PathBuf;
 use std::str::FromStr;
 use utils::{get_system_css_path, user_style_path};
-use zbus::{dbus_interface, ConnectionBuilder};
+use zbus::{interface, ConnectionBuilder};
 
 struct DbusServer {
 	sender: Sender<(ArgTypes, String)>,
 }
 
-#[dbus_interface(name = "org.erikreider.swayosd")]
+#[interface(name = "org.erikreider.swayosd")]
 impl DbusServer {
 	pub fn handle_action(&self, arg_type: String, data: String) -> bool {
 		let arg_type = match ArgTypes::from_str(&arg_type) {