From 80d5fd1c801108240fc8874fa754dde21f53a897 Mon Sep 17 00:00:00 2001
From: Alexandr Bogomyakov <abogomyakov@iponweb.net>
Date: Wed, 29 Jul 2020 17:21:22 +0300
Subject: [PATCH] Fixing event handling.

---
 .github/workflows/PKGBUILD |  2 +-
 Cargo.lock                 | 24 ++++++++++++------------
 Cargo.toml                 |  2 +-
 src/main.rs                |  6 +++---
 4 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/.github/workflows/PKGBUILD b/.github/workflows/PKGBUILD
index 88feb8e..87f27aa 100644
--- a/.github/workflows/PKGBUILD
+++ b/.github/workflows/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Alexandr Bogomyakov (ultradesu) <ab@hexor.ru>
 
 pkgname=swkb
-pkgver=0.2.0
+pkgver=0.2.1
 pkgrel=1
 pkgdesc="swkb"
 url="https://github.com/house-of-vanity/swkb.git"
diff --git a/Cargo.lock b/Cargo.lock
index 1faaecc..d124fad 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -521,18 +521,6 @@ dependencies = [
  "winapi",
 ]
 
-[[package]]
-name = "sway-layout"
-version = "0.2.0"
-dependencies = [
- "async-std",
- "failure",
- "futures-core",
- "serde",
- "serde_json",
- "swayipc",
-]
-
 [[package]]
 name = "swayipc"
 version = "2.7.0"
@@ -546,6 +534,18 @@ dependencies = [
  "serde_json",
 ]
 
+[[package]]
+name = "swkb"
+version = "0.2.0"
+dependencies = [
+ "async-std",
+ "failure",
+ "futures-core",
+ "serde",
+ "serde_json",
+ "swayipc",
+]
+
 [[package]]
 name = "syn"
 version = "1.0.35"
diff --git a/Cargo.toml b/Cargo.toml
index 74359a0..34f9673 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "swkb"
-version = "0.2.0"
+version = "0.2.1"
 authors = ["Alexandr Bogomyakov <abogomyakov@iponweb.net>"]
 edition = "2018"
 
diff --git a/src/main.rs b/src/main.rs
index 693f34f..24165a4 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -46,8 +46,8 @@ async fn main() -> Fallible<()> {
     let subs = [EventType::Input, EventType::Window];
     let mut events = connection.subscribe(&subs).await?;
     while let Some(event) = events.next().await {
-        match event.unwrap() {
-            Event::Input(event) => {
+        match event {
+            Ok(Event::Input(event)) => {
                 let layouts_list = event.input.xkb_layout_names;
                 let layout_name = event.input.xkb_active_layout_name.unwrap();
                 let index = layouts_list.iter().position(|r| *r == layout_name).unwrap() as i64;
@@ -56,7 +56,7 @@ async fn main() -> Fallible<()> {
                 //println!("Layout saved [{:?}] for {:?}", layout_name, current_window);
                 layouts.insert(current_window, index);
             }
-            Event::Window(event) => match event.change {
+            Ok(Event::Window(event)) => match event.change {
                 swayipc::reply::WindowChange::Focus => {
                     let layouts = layouts.lock().unwrap();
                     let mut connection = Connection::new().await?;