From 0350dca972b2bd92c08958763a3735c83fe0be93 Mon Sep 17 00:00:00 2001
From: Drakulix <github@drakulix.de>
Date: Mon, 27 Nov 2017 17:12:35 +0100
Subject: [PATCH] Automatically add udev backend to the event loop store

---
 examples/udev.rs    | 3 +--
 src/backend/udev.rs | 6 +++---
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/examples/udev.rs b/examples/udev.rs
index 48aa1d9..0bee0a6 100644
--- a/examples/udev.rs
+++ b/examples/udev.rs
@@ -203,7 +203,7 @@ fn main() {
      */
     let context = libudev::Context::new().unwrap();
     let bytes = include_bytes!("resources/cursor2.rgba");
-    let udev
+    let udev_token
         = UdevBackend::new(&mut event_loop, &context, session.clone(), UdevHandlerImpl {
             shell_state_token,
             compositor_token,
@@ -213,7 +213,6 @@ fn main() {
             logger: log.clone(),
         }, log.clone()).unwrap();
 
-    let udev_token = event_loop.state().insert(udev);
     let udev_session_id = notifier.register(udev_token.clone());
 
     let (seat_token, _) = Seat::new(&mut event_loop, session.seat().into(), log.clone());
diff --git a/src/backend/udev.rs b/src/backend/udev.rs
index 794cb76..e7aac4a 100644
--- a/src/backend/udev.rs
+++ b/src/backend/udev.rs
@@ -28,7 +28,7 @@ impl<B: From<DrmBackend> + Borrow<DrmBackend> + 'static, H: DrmHandler<B> + 'sta
                       mut session: S,
                       mut handler: T,
                       logger: L)
-        -> Result<UdevBackend<B, H, S, T>>
+        -> Result<StateToken<UdevBackend<B, H, S, T>>>
     where
         L: Into<Option<::slog::Logger>>
     {
@@ -104,13 +104,13 @@ impl<B: From<DrmBackend> + Borrow<DrmBackend> + 'static, H: DrmHandler<B> + 'sta
         builder.match_subsystem("drm").chain_err(|| ErrorKind::FailedToInitMonitor)?;
         let monitor = builder.listen().chain_err(|| ErrorKind::FailedToInitMonitor)?;
 
-        Ok(UdevBackend {
+        Ok(evlh.state().insert(UdevBackend {
             devices,
             monitor,
             session,
             handler,
             logger,
-        })
+        }))
     }
 
     pub fn close<'a, ST: Into<StateProxy<'a>>>(mut self, state: ST) {