From 9def4f259ced2462062fbb3e301767867fd20e50 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Date: Tue, 11 Jun 2024 11:42:26 +0400 Subject: [PATCH] qemu-rdp: actually register dbus clipboard handler MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Marc-André Lureau --- qemu-rdp/src/server/clipboard.rs | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/qemu-rdp/src/server/clipboard.rs b/qemu-rdp/src/server/clipboard.rs index 8558fc3..a8ba12a 100644 --- a/qemu-rdp/src/server/clipboard.rs +++ b/qemu-rdp/src/server/clipboard.rs @@ -207,7 +207,7 @@ async fn rdp_clipboard_receive_task(mut rx: Receiver, cb: Clipbo Some(ClipboardEvent::Register) => { debug!("Register -> dbus"); - clipboard.proxy.register().await + clipboard.register(cb.clone()).await } Some(ClipboardEvent::Grab { selection, @@ -228,12 +228,16 @@ async fn rdp_clipboard_receive_task(mut rx: Receiver, cb: Clipbo let mimes: Vec<&str> = mimes.iter().map(AsRef::as_ref).collect(); - clipboard.proxy.grab(selection, serial, &mimes).await + clipboard + .proxy + .grab(selection, serial, &mimes) + .await + .map_err(Into::into) } Some(ClipboardEvent::Release { selection }) => { debug!("Release -> dbus"); - clipboard.proxy.release(selection).await + clipboard.proxy.release(selection).await.map_err(Into::into) } Some(ClipboardEvent::Request { selection, request }) => { debug!(?request, "Request -> dbus"); @@ -278,7 +282,7 @@ async fn rdp_clipboard_receive_task(mut rx: Receiver, cb: Clipbo }; if let Err(e) = res { - error!(?e, "input handling error"); + error!(?e, "clipboard task handling error"); } } }