From c4270198843752b7073e1d7d81f290fe7c149508 Mon Sep 17 00:00:00 2001
From: Jens Nolte <git@queezle.net>
Date: Tue, 8 Dec 2020 17:48:09 +0100
Subject: [PATCH] Remove incorrect i3 socket detection
---
src/QBar/ControlSocket.hs | 10 +++-------
1 file changed, 3 insertions(+), 7 deletions(-)
diff --git a/src/QBar/ControlSocket.hs b/src/QBar/ControlSocket.hs
index 67cd966..dab3e47 100644
--- a/src/QBar/ControlSocket.hs
+++ b/src/QBar/ControlSocket.hs
@@ -215,19 +215,15 @@ ipcSocketAddress MainOptions{socketLocation} = maybe defaultSocketPath (return .
defaultSocketPath :: IO FilePath
defaultSocketPath = do
waylandSocketPath' <- waylandSocketPath
- maybe (maybe headlessSocketPath return =<< i3SocketPath) return waylandSocketPath'
+ maybe fallbackSocketPath return waylandSocketPath'
where
waylandSocketPath :: IO (Maybe FilePath)
waylandSocketPath = handleEnvError $ do
xdgRuntimeDir <- getEnv "XDG_RUNTIME_DIR"
waylandDisplay <- getEnv "WAYLAND_DISPLAY"
return $ xdgRuntimeDir </> waylandDisplay <> "-qbar"
- i3SocketPath :: IO (Maybe FilePath)
- i3SocketPath = handleEnvError $ do
- i3SocketPath' <- getEnv "I3_SOCKET_PATH"
- return $ i3SocketPath' <> "-qbar"
- headlessSocketPath :: IO FilePath
- headlessSocketPath = do
+ fallbackSocketPath :: IO FilePath
+ fallbackSocketPath = do
xdgRuntimeDir <- getEnv "XDG_RUNTIME_DIR"
return $ xdgRuntimeDir </> "qbar"
handleEnvError :: IO FilePath -> IO (Maybe FilePath)
--
GitLab