From 458d9887d5010a8ce525d15737c2a3d217adbd96 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= <marcandre.lureau@redhat.com>
Date: Mon, 16 Aug 2021 00:20:54 +0400
Subject: [PATCH] qd: rename Introspect->Display
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
 qemu-display/src/{introspect.rs => display.rs} |  4 ++--
 qemu-display/src/lib.rs                        |  4 ++--
 qemu-rdw/src/main.rs                           | 12 +++++++-----
 3 files changed, 11 insertions(+), 9 deletions(-)
 rename qemu-display/src/{introspect.rs => display.rs} (97%)

diff --git a/qemu-display/src/introspect.rs b/qemu-display/src/display.rs
similarity index 97%
rename from qemu-display/src/introspect.rs
rename to qemu-display/src/display.rs
index 80423c4..9c2e2f9 100644
--- a/qemu-display/src/introspect.rs
+++ b/qemu-display/src/display.rs
@@ -6,12 +6,12 @@ use zvariant::OwnedObjectPath;
 
 use crate::{Audio, Chardev, Result, UsbRedir};
 
-pub struct Introspect {
+pub struct Display {
     conn: Connection,
     objects: ManagedObjects,
 }
 
-impl Introspect {
+impl Display {
     pub async fn new(conn: &Connection) -> Result<Self> {
         let objects = zbus::fdo::AsyncObjectManagerProxy::builder(&conn)
             .destination("org.qemu")?
diff --git a/qemu-display/src/lib.rs b/qemu-display/src/lib.rs
index 5ef371e..0385dcb 100644
--- a/qemu-display/src/lib.rs
+++ b/qemu-display/src/lib.rs
@@ -30,8 +30,8 @@ pub use keyboard::*;
 mod mouse;
 pub use mouse::*;
 
-mod introspect;
-pub use introspect::*;
+mod display;
+pub use display::*;
 
 mod usbredir;
 pub use usbredir::*;
diff --git a/qemu-rdw/src/main.rs b/qemu-rdw/src/main.rs
index 7b4b52e..8585dc9 100644
--- a/qemu-rdw/src/main.rs
+++ b/qemu-rdw/src/main.rs
@@ -2,7 +2,7 @@ use gio::ApplicationFlags;
 use glib::{clone, MainContext};
 use gtk::{gio, glib, prelude::*};
 use once_cell::sync::OnceCell;
-use qemu_display::{Chardev, Console, Introspect};
+use qemu_display::{Chardev, Console, Display};
 use std::os::unix::io::AsRawFd;
 use std::os::unix::net::UnixStream;
 use zbus::Connection;
@@ -33,13 +33,15 @@ fn main() {
         let audio_clone = audio.clone();
         let clipboard_clone = clipboard.clone();
         MainContext::default().spawn_local(clone!(@strong window => async move {
-            let intro = Introspect::new(&conn).await.unwrap();
+            let display = Display::new(&conn).await.unwrap();
 
             let console = Console::new(&conn, 0).await.expect("Failed to get the QEMU console");
-            let display = display_qemu::DisplayQemu::new(console);
-            window.set_child(Some(&display));
+            let rdw = display_qemu::DisplayQemu::new(console);
+            window.set_child(Some(&rdw));
 
-            if let Ok(Some(audio)) = intro.audio().await {
+            let usbredir = display.usbredir().await;
+
+            if let Ok(Some(audio)) = display.audio().await {
                 match audio::Handler::new(audio).await {
                     Ok(handler) => audio_clone.set(handler).unwrap(),
                     Err(e) => log::warn!("Failed to setup audio: {}", e),