Follow zbus upstream

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>

Cargo.toml

@@ -15,6 +15,3 @@ vnc = { git = "https://github.com/elmarco/rust-vnc", branch = "server" }
 zbus = { git = "https://gitlab.freedesktop.org/dbus/zbus.git" }
 zvariant = { git = "https://gitlab.freedesktop.org/dbus/zbus.git" }
 rdw4 = { git = "https://gitlab.gnome.org/malureau/rdw.git" }
-#zbus = { path = "../zbus/zbus" }
-#zvariant = { path = "../zbus/zvariant" }
-#rdw4 = { path = "../rdw/rdw4" }

qemu-display/Cargo.toml

@@ -10,9 +10,9 @@ edition = "2018"
 log = "0.4"
 derivative = "2.2.0"
 zbus = { version = "2.0.0-beta.7", features = ["xml"] }
-zvariant = { version = "2.4.0", features = ["serde_bytes"] }
+zvariant = { version = "3.0", features = ["serde_bytes"] }
 libc = "0.2.86"
-enumflags2 = { version = "0.6.4", features = ["serde"] }
+enumflags2 = { version = "0.7", features = ["serde"] }
 serde = { version = "1.0.123", features = ["derive"] }
 serde_repr = "0.1.6"
 serde_bytes = "0.11.5"

qemu-display/src/clipboard.rs

@@ -1,7 +1,7 @@
 use serde_repr::{Deserialize_repr, Serialize_repr};
 use std::convert::TryFrom;
 use zbus::{dbus_interface, dbus_proxy, zvariant::ObjectPath};
-use zvariant::derive::Type;
+use zvariant::Type;
 
 use crate::Result;
 
@@ -109,12 +109,12 @@ impl Clipboard {
 
     pub async fn register<H: ClipboardHandler>(&self, handler: H) -> Result<()> {
         self.conn
-            .object_server_mut()
-            .await
+            .object_server()
             .at(
                 "/org/qemu/Display1/Clipboard",
                 ClipboardListener { handler },
             )
+            .await
             .unwrap();
         Ok(self.proxy.register().await?)
     }

qemu-display/src/keyboard.rs

@@ -1,10 +1,11 @@
-use enumflags2::BitFlags;
+use enumflags2::{bitflags, BitFlags};
 use serde::{Deserialize, Serialize};
 use zbus::dbus_proxy;
-use zvariant::derive::Type;
+use zvariant::Type;
 
+#[bitflags]
 #[repr(u32)]
-#[derive(Type, BitFlags, Debug, PartialEq, Copy, Clone, Serialize, Deserialize)]
+#[derive(Type, Debug, PartialEq, Copy, Clone, Serialize, Deserialize)]
 pub enum KeyboardModifiers {
     Scroll = 0x1,
     Num = 0x2,

qemu-display/src/mouse.rs

@@ -1,6 +1,6 @@
 use serde_repr::{Deserialize_repr, Serialize_repr};
 use zbus::dbus_proxy;
-use zvariant::derive::Type;
+use zvariant::Type;
 
 #[repr(u32)]
 #[derive(Deserialize_repr, Serialize_repr, Type, Debug, Hash, PartialEq, Eq, Clone, Copy)]