Merge branch 'master' into next

[i3/i3] / i3-input / main.c

diff --git a/i3-input/main.c b/i3-input/main.c
index 25ccceaac7208ea41ed85e6c79ca649f16b7bf51..b570952397ccfd5f1e55ef75d1eb625f3d0f89e4 100644 (file)
--- a/i3-input/main.c
+++ b/i3-input/main.c
@@ -342,7 +342,7 @@ int main(int argc, char *argv[]) {
     printf("using format \"%s\"\n", format);
 
     if (socket_path == NULL)
-        socket_path = socket_path_from_x11();
+        socket_path = root_atom_contents("I3_SOCKET_PATH");
 
     if (socket_path == NULL)
         socket_path = "/tmp/i3-ipc.sock";