From 30e3d3b0803a4a1edf8b99c95c24bd908843dc56 Mon Sep 17 00:00:00 2001
From: Tassilo Horn <tsdh@gnu.org>
Date: Thu, 3 Mar 2022 16:49:29 +0100
Subject: [PATCH] Fix #17 and release v0.14.1

Fixes: https://todo.sr.ht/~tsdh/swayr/17
---
 Cargo.lock  | 22 +++++++++++-----------
 Cargo.toml  |  2 +-
 src/tree.rs |  6 +++++-
 3 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 8ba60b1..ba406d7 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -42,9 +42,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
 [[package]]
 name = "clap"
-version = "3.1.2"
+version = "3.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5177fac1ab67102d8989464efd043c6ff44191b1557ec1ddd489b4f7e1447e77"
+checksum = "ced1892c55c910c1219e98d6fc8d71f6bddba7905866ce740066d8bfea859312"
 dependencies = [
  "atty",
  "bitflags",
@@ -59,9 +59,9 @@ dependencies = [
 
 [[package]]
 name = "clap_derive"
-version = "3.1.2"
+version = "3.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "01d42c94ce7c2252681b5fed4d3627cc807b13dfc033246bd05d5b252399000e"
+checksum = "da95d038ede1a964ce99f49cbe27a7fb538d1da595e4b4f70b8c8f338d17bf16"
 dependencies = [
  "heck",
  "proc-macro-error",
@@ -273,9 +273,9 @@ dependencies = [
 
 [[package]]
 name = "redox_syscall"
-version = "0.2.10"
+version = "0.2.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8383f39639269cde97d255a32bdb68c047337295414940c68bdd30c2e13203ff"
+checksum = "8380fe0152551244f0747b1bf41737e0f8a74f97a14ccefd1148187271634f3c"
 dependencies = [
  "bitflags",
 ]
@@ -384,7 +384,7 @@ dependencies = [
 
 [[package]]
 name = "swayr"
-version = "0.14.0"
+version = "0.14.1"
 dependencies = [
  "clap",
  "directories",
@@ -413,18 +413,18 @@ dependencies = [
 
 [[package]]
 name = "termcolor"
-version = "1.1.2"
+version = "1.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2dfed899f0eb03f32ee8c6a0aabdb8a7949659e3466561fc0adf54e26d88c5f4"
+checksum = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755"
 dependencies = [
  "winapi-util",
 ]
 
 [[package]]
 name = "textwrap"
-version = "0.14.2"
+version = "0.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0066c8d12af8b5acd21e00547c3797fde4e8677254a7ee429176ccebbe93dd80"
+checksum = "b1141d4d61095b28419e22cb0bbf02755f5e54e0526f97f1e3d1d160e60885fb"
 
 [[package]]
 name = "thiserror"
diff --git a/Cargo.toml b/Cargo.toml
index 2384429..812cab0 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "swayr"
-version = "0.14.0"
+version = "0.14.1"
 description = "A LRU window-switcher (and more) for the sway window manager"
 homepage = "https://sr.ht/~tsdh/swayr/"
 repository = "https://git.sr.ht/~tsdh/swayr"
diff --git a/src/tree.rs b/src/tree.rs
index 2feaf73..b12a4f9 100644
--- a/src/tree.rs
+++ b/src/tree.rs
@@ -105,7 +105,11 @@ impl NodeMethods for s::Node {
                     // Apparently there can be windows without app_id, name,
                     // and window_properties.class, e.g., dolphin-emu-nogui.
                     && self.pid.is_some()
-                    && self.shell.is_some()
+                // FIXME: While technically correct, old sway versions (up to
+                // at least sway-1.4) don't expose shell in IPC.  So comment in
+                // again when all major distros have a recent enough sway
+                // package.
+                //&& self.shell.is_some()
                 {
                     Type::Window
                 } else {