Merge branch 'master' into next

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

diff --git a/i3-msg/main.c b/i3-msg/main.c
index 6a3b29d3eb77bad86150d88fd8a0431055423396..ccf6e10f276a54ce8d2716b593db7d9895890442 100644 (file)
--- a/i3-msg/main.c
+++ b/i3-msg/main.c
@@ -91,7 +91,7 @@ int main(int argc, char *argv[]) {
     }
 
     if (socket_path == NULL)
-        socket_path = socket_path_from_x11();
+        socket_path = root_atom_contents("I3_SOCKET_PATH");
 
     /* Fall back to the default socket path */
     if (socket_path == NULL)