i3bar: when kicking tray clients, remove them immediately

This should fix empty spaces showing up instead of tray icons sometimes.

diff --git a/i3bar/src/xcb.c b/i3bar/src/xcb.c
index 67572480510ba5075f0d300f0b364e3701f25787..c2cf68794fad995fa0ee94ac8f32f9cb22ec3a29 100644 (file)
--- a/i3bar/src/xcb.c
+++ b/i3bar/src/xcb.c
@@ -1110,7 +1110,8 @@ void get_atoms() {
  */
 void kick_tray_clients(i3_output *output) {
     trayclient *trayclient;
-    TAILQ_FOREACH(trayclient, output->trayclients, tailq) {
+    while (!TAILQ_EMPTY(output->trayclients)) {
+        trayclient = TAILQ_FIRST(output->trayclients);
         /* Unmap, then reparent (to root) the tray client windows */
         xcb_unmap_window(xcb_connection, trayclient->win);
         xcb_reparent_window(xcb_connection,
@@ -1118,7 +1119,14 @@ void kick_tray_clients(i3_output *output) {
                             xcb_root,
                             0,
                             0);
+
+        /* We remove the trayclient right here. We might receive an UnmapNotify
+         * event afterwards, but better safe than sorry. */
+        TAILQ_REMOVE(output->trayclients, trayclient, tailq);
     }
+
+    /* Trigger an update, we now have more space for the statusline */
+    draw_bars();
 }
 
 /*