Bugfix: Properly skip "consumption", not "consumptionbuf" (Thanks mloskot)

[i3/i3status] / src / output.c

diff --git a/src/output.c b/src/output.c
index 96dd3e498073ffe6286d5ce4b194ceb6046671b6..c4a2d275cde9864b00561d94e2eaffbb5eab76e6 100644 (file)
--- a/src/output.c
+++ b/src/output.c
@@ -24,8 +24,6 @@ char *color(const char *colorstr) {
                 (void)snprintf(colorbuf, sizeof(colorbuf), "^fg(%s)", cfg_getstr(cfg_general, colorstr));
         else if (output_format == O_XMOBAR)
                 (void)snprintf(colorbuf, sizeof(colorbuf), "<fc=%s>", cfg_getstr(cfg_general, colorstr));
-        else if (output_format == O_I3BAR)
-                (void)snprintf(colorbuf, sizeof(colorbuf), "\"color\":\"%s\", ", cfg_getstr(cfg_general, colorstr));
 
         return colorbuf;
 }
@@ -34,19 +32,17 @@ char *color(const char *colorstr) {
  * Some color formats (xmobar) require to terminate colors again
  *
  */
-char *endcolor() {
+char *endcolor(void) {
         if (output_format == O_XMOBAR)
                 return "</fc>";
         else return "";
 }
 
-void print_seperator() {
+void print_seperator(void) {
         if (output_format == O_DZEN2)
                 printf("^fg(%s)^p(5;-2)^ro(2)^p()^fg()^p(5)", cfg_getstr(cfg_general, "color_separator"));
         else if (output_format == O_XMOBAR)
                 printf("<fc=%s> | </fc>", cfg_getstr(cfg_general, "color_separator"));
-        else if (output_format == O_I3BAR)
-                printf(", ");
         else if (output_format == O_NONE)
                 printf(" | ");
 }