From: Michael Stapelberg <michael@stapelberg.de>
Date: Sat, 23 Feb 2013 17:04:52 +0000 (+0100)
Subject: ipv6: properly handle colors for output_format == xmobar
X-Git-Tag: 2.7~4
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=d52b9f82ca2f1f1e91ac2be812218f9cbdf0459a;p=i3%2Fi3status

ipv6: properly handle colors for output_format == xmobar
---

diff --git a/src/print_ipv6_addr.c b/src/print_ipv6_addr.c
index 8b11e1f..fa50ea5 100644
--- a/src/print_ipv6_addr.c
+++ b/src/print_ipv6_addr.c
@@ -123,11 +123,13 @@ void print_ipv6_info(yajl_gen json_gen, char *buffer, const char *format_up, con
 
         if (addr_string == NULL) {
                 START_COLOR("color_bad");
-                OUTPUT_FULL_TEXT(format_down);
+                outwalk += sprintf(outwalk, "%s", format_down);
                 END_COLOR;
+                OUTPUT_FULL_TEXT(buffer);
                 return;
         }
 
+        START_COLOR("color_good");
         for (walk = format_up; *walk != '\0'; walk++) {
                 if (*walk != '%') {
                         *(outwalk++) = *walk;
@@ -139,7 +141,6 @@ void print_ipv6_info(yajl_gen json_gen, char *buffer, const char *format_up, con
                         walk += strlen("ip");
                 }
         }
-        START_COLOR("color_good");
-        OUTPUT_FULL_TEXT(buffer);
         END_COLOR;
+        OUTPUT_FULL_TEXT(buffer);
 }