Merge branch 'next'

diff --cc i3bar/src/xcb.c
index 7f6379e191958333fac53f4084e7eec637f09e5e,326ca2ad8dd2cc60407bf4d882762f252813f0ce..300ac8595932a0ea5f9840b7c80e8c8deb155daa
--- 1/i3bar/src/xcb.c
--- 2/i3bar/src/xcb.c
+++ b/i3bar/src/xcb.c
@@@ -327,10 -634,8 +634,10 @@@ void destroy_window(i3_output *output) 
   */
  void reconfig_windows() {
      uint32_t mask;
-     uint32_t values[4];
+     uint32_t values[5];
  
 +    xcb_generic_error_t *err;
 +
      i3_output *walk;
      SLIST_FOREACH(walk, outputs, slist) {
          if (!walk->active) {