From: Michael Stapelberg <michael@stapelberg.de>
Date: Wed, 1 Jan 2014 10:10:26 +0000 (+0100)
Subject: Merge branch 'master' into next
X-Git-Tag: 4.8~175
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=67b213665b7f4dc5302c5f39bf0c761c3e762fc3;hp=1e1e4ef9df847dac31da235cdf467bbcc2452e24;p=i3%2Fi3

Merge branch 'master' into next
---

diff --git a/i3bar/src/xcb.c b/i3bar/src/xcb.c
index d3dc948e..82861039 100644
--- a/i3bar/src/xcb.c
+++ b/i3bar/src/xcb.c
@@ -603,17 +603,18 @@ static void handle_client_message(xcb_client_message_event_t* event) {
              * exits/crashes. */
             xcb_change_save_set(xcb_connection, XCB_SET_MODE_INSERT, client);
 
+            trayclient *tc = smalloc(sizeof(trayclient));
+            tc->win = client;
+            tc->xe_version = xe_version;
+            tc->mapped = false;
+            TAILQ_INSERT_TAIL(output->trayclients, tc, tailq);
+
             if (map_it) {
                 DLOG("Mapping dock client\n");
                 xcb_map_window(xcb_connection, client);
             } else {
                 DLOG("Not mapping dock client yet\n");
             }
-            trayclient *tc = smalloc(sizeof(trayclient));
-            tc->win = client;
-            tc->xe_version = xe_version;
-            TAILQ_INSERT_TAIL(output->trayclients, tc, tailq);
-
             /* Trigger an update to copy the statusline text to the appropriate
              * position */
             configure_trayclients();