From: Michael Stapelberg <michael@stapelberg.de>
Date: Wed, 2 Jul 2014 17:06:01 +0000 (+0200)
Subject: Merge branch 'master' into next
X-Git-Tag: 4.9~80
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=5cbe2d63c0bdd4edd2736f32714443d57f1eacb6;p=i3%2Fi3

Merge branch 'master' into next
---

5cbe2d63c0bdd4edd2736f32714443d57f1eacb6
diff --cc i3bar/src/config.c
index 1f0c2a8e,809b1ab4..6f1a8b8e
--- a/i3bar/src/config.c
+++ b/i3bar/src/config.c
@@@ -246,10 -246,9 +246,9 @@@ void parse_config_json(char *json) 
   *
   */
  void free_colors(struct xcb_color_strings_t *colors) {
--#define FREE_COLOR(x)        \
--    do {                     \
-         if (colors->x)       \
-             free(colors->x); \
 -        FREE(colors->x);     \
++#define FREE_COLOR(x)    \
++    do {                 \
++        FREE(colors->x); \
      } while (0)
      FREE_COLOR(bar_fg);
      FREE_COLOR(bar_bg);