From f8d8acd93c74a346ef335154b15b50c016667b23 Mon Sep 17 00:00:00 2001
From: shdown <shdownnine@gmail.com>
Date: Thu, 20 Aug 2015 22:55:23 +0300
Subject: [PATCH 1/3] i3-msg: strdup getenv() result before freeing

Fixes #1852.
---
 i3-msg/main.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/i3-msg/main.c b/i3-msg/main.c
index 354e8af9..238fe152 100644
--- a/i3-msg/main.c
+++ b/i3-msg/main.c
@@ -119,7 +119,11 @@ static yajl_callbacks reply_callbacks = {
 };
 
 int main(int argc, char *argv[]) {
-    socket_path = getenv("I3SOCK");
+    char *env_socket_path = getenv("I3SOCK");
+    if (env_socket_path)
+        socket_path = sstrdup(env_socket_path);
+    else
+        socket_path = NULL;
     int o, option_index = 0;
     uint32_t message_type = I3_IPC_MESSAGE_TYPE_COMMAND;
     char *payload = NULL;

From ce7d256d05adea3d17eb16b336a3237fb5529ea2 Mon Sep 17 00:00:00 2001
From: Michael Stapelberg <michael@stapelberg.de>
Date: Tue, 25 Aug 2015 20:09:56 +0200
Subject: [PATCH 2/3] Revert "Check if output is disabled in handle_output()"

This reverts commit e71c304444dd3070877887d2bb5407cd64033946.

It turns out that several users have workflows in which they turn off
their monitors without using e.g. `xrandr --output DP-1 --off`. The
result is that the monitors are disconnected, but not disabled.

With commit e71c304444dd3070877887d2bb5407cd64033946, i3 started to see
these two states as one and the same state, but that causes more harm
than it does good. For example, for some users with only one monitor, i3
would just exit when these users turned off their monitor.

related to #1858, #1839

fixes #1845
---
 src/randr.c | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/src/randr.c b/src/randr.c
index 9549c9d5..a4a0f6fd 100644
--- a/src/randr.c
+++ b/src/randr.c
@@ -555,12 +555,6 @@ static void handle_output(xcb_connection_t *conn, xcb_randr_output_t id,
         return;
     }
 
-    if (output->connection == XCB_RANDR_CONNECTION_DISCONNECTED) {
-        DLOG("Disabling output %s: it is disconnected\n", new->name);
-        new->to_be_disabled = true;
-        return;
-    }
-
     bool updated = update_if_necessary(&(new->rect.x), crtc->x) |
                    update_if_necessary(&(new->rect.y), crtc->y) |
                    update_if_necessary(&(new->rect.width), crtc->width) |

From 69eb4619a75e133cb198fa606cc9c9495f641fe5 Mon Sep 17 00:00:00 2001
From: Michael Stapelberg <michael@stapelberg.de>
Date: Tue, 8 Sep 2015 09:19:17 +0200
Subject: [PATCH 3/3] release i3 4.10.4

---
 RELEASE-NOTES-4.10.3 => RELEASE-NOTES-4.10.4 | 18 ++++++------------
 man/asciidoc.conf                            |  2 +-
 2 files changed, 7 insertions(+), 13 deletions(-)
 rename RELEASE-NOTES-4.10.3 => RELEASE-NOTES-4.10.4 (54%)

diff --git a/RELEASE-NOTES-4.10.3 b/RELEASE-NOTES-4.10.4
similarity index 54%
rename from RELEASE-NOTES-4.10.3
rename to RELEASE-NOTES-4.10.4
index 524f5528..803bc7fb 100644
--- a/RELEASE-NOTES-4.10.3
+++ b/RELEASE-NOTES-4.10.4
@@ -1,23 +1,17 @@
 
  ┌──────────────────────────────┐
- │ Release notes for i3 v4.10.3 │
+ │ Release notes for i3 v4.10.4 │
  └──────────────────────────────┘
 
-This is i3 v4.10.3. This version is considered stable. All users of i3 are
+This is i3 v4.10.4. This version is considered stable. All users of i3 are
 strongly encouraged to upgrade.
 
  ┌────────────────────────────┐
  │ Bugfixes                   │
  └────────────────────────────┘
 
-  • serialize con_id with %p in run_binding() (For FreeBSD)
-  • ignore InputHint when not in WM_HINTS (fixes e.g. mupdf focus)
-  • disable physically disconnect RandR outputs
-  • initialize workspace rect to the output's upon creation
-  • userguide: quoted strings need to be used, escaping isn’t possible
-  • mkdirp: do not throw an error if directory exists (fixes layout loss for
-    in-place restarts)
-  • i3bar: fix freeing static strings
+  • revert: disable physically disconnected RandR outputs
+  • i3-msg: strdup getenv() result before freeing
 
  ┌────────────────────────────┐
  │ Thanks!                    │
@@ -25,6 +19,6 @@ strongly encouraged to upgrade.
 
 Thanks for testing, bugfixes, discussions and everything I forgot go out to:
 
-  Tony Crisci, Deiz, Theo Buehler, shdown
+  shdown
 
--- Michael Stapelberg, 2015-07-30
+-- Michael Stapelberg, 2015-09-08
diff --git a/man/asciidoc.conf b/man/asciidoc.conf
index eda71d6e..ad2348d6 100644
--- a/man/asciidoc.conf
+++ b/man/asciidoc.conf
@@ -7,7 +7,7 @@ template::[header-declarations]
 <refentrytitle>{mantitle}</refentrytitle>
 <manvolnum>{manvolnum}</manvolnum>
 <refmiscinfo class="source">i3</refmiscinfo>
-<refmiscinfo class="version">4.10.3</refmiscinfo>
+<refmiscinfo class="version">4.10.4</refmiscinfo>
 <refmiscinfo class="manual">i3 Manual</refmiscinfo>
 </refmeta>
 <refnamediv>