From 73d7a1d73dac14bcff43a1d595847b7c0bf14ec7 Mon Sep 17 00:00:00 2001
From: Ivan Molodetskikh <yalterz@gmail.com>
Date: Sun, 3 Sep 2023 13:14:20 +0400
Subject: Remove DisplayHandle from LoopData

---
 src/main.rs | 6 +-----
 src/niri.rs | 1 +
 2 files changed, 2 insertions(+), 5 deletions(-)

(limited to 'src')

diff --git a/src/main.rs b/src/main.rs
index 222aa1e3..2e77fd42 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -19,7 +19,7 @@ use backend::{Backend, Tty, Winit};
 use clap::Parser;
 use niri::Niri;
 use smithay::reexports::calloop::EventLoop;
-use smithay::reexports::wayland_server::{Display, DisplayHandle};
+use smithay::reexports::wayland_server::Display;
 use tracing_subscriber::EnvFilter;
 
 #[derive(Parser)]
@@ -32,8 +32,6 @@ struct Cli {
 
 pub struct LoopData {
     niri: Niri,
-    display_handle: DisplayHandle,
-
     backend: Backend,
 
     // Last so that it's dropped after the Smithay state in Niri and related state in Tty.
@@ -66,7 +64,6 @@ fn main() {
     };
 
     let mut display = Display::new().unwrap();
-    let display_handle = display.handle();
     let niri = Niri::new(
         event_loop.handle(),
         event_loop.get_signal(),
@@ -76,7 +73,6 @@ fn main() {
 
     let mut data = LoopData {
         niri,
-        display_handle,
         display,
 
         backend,
diff --git a/src/niri.rs b/src/niri.rs
index 1a5f990a..25fd3bc9 100644
--- a/src/niri.rs
+++ b/src/niri.rs
@@ -154,6 +154,7 @@ impl Niri {
         event_loop
             .insert_source(socket_source, move |client, _, data| {
                 if let Err(err) = data
+                    .niri
                     .display_handle
                     .insert_client(client, Arc::new(ClientState::default()))
                 {
-- 
cgit