Merge pull request #1515 from Airblader/feature-commands-error-messages

[i3/i3] / i3bar / src / child.c

diff --git a/i3bar/src/child.c b/i3bar/src/child.c
index 1860b8792d9798fa820880eb8dcb680caf322102..efe028843d0e4b2e1b5fa02d70efc9bc3fa04f9f 100644 (file)
--- a/i3bar/src/child.c
+++ b/i3bar/src/child.c
@@ -72,6 +72,7 @@ static void clear_statusline(struct statusline_head *head, bool free_resources)
             I3STRING_FREE(first->full_text);
             FREE(first->color);
             FREE(first->name);
+            FREE(first->instance);
         }
 
         TAILQ_REMOVE(head, first, blocks);
@@ -81,7 +82,7 @@ static void clear_statusline(struct statusline_head *head, bool free_resources)
 
 static void copy_statusline(struct statusline_head *from, struct statusline_head *to) {
     struct status_block *current;
-    TAILQ_FOREACH (current, from, blocks) {
+    TAILQ_FOREACH(current, from, blocks) {
         struct status_block *new_block = smalloc(sizeof(struct status_block));
         memcpy(new_block, current, sizeof(struct status_block));
         TAILQ_INSERT_TAIL(to, new_block, blocks);
@@ -185,7 +186,7 @@ static int stdin_boolean(void *context, int val) {
 static int stdin_string(void *context, const unsigned char *val, size_t len) {
     parser_ctx *ctx = context;
     if (strcasecmp(ctx->last_map_key, "full_text") == 0) {
-        ctx->block.full_text = i3string_from_utf8_with_length((const char *)val, len);
+        ctx->block.full_text = i3string_from_markup_with_length((const char *)val, len);
     }
     if (strcasecmp(ctx->last_map_key, "color") == 0) {
         sasprintf(&(ctx->block.color), "%.*s", len, val);
@@ -199,7 +200,7 @@ static int stdin_string(void *context, const unsigned char *val, size_t len) {
             ctx->block.align = ALIGN_LEFT;
         }
     } else if (strcasecmp(ctx->last_map_key, "min_width") == 0) {
-        i3String *text = i3string_from_utf8_with_length((const char *)val, len);
+        i3String *text = i3string_from_markup_with_length((const char *)val, len);
         ctx->block.min_width = (uint32_t)predict_text_width(text);
         i3string_free(text);
     }
@@ -319,7 +320,7 @@ static void read_flat_input(char *buffer, int length) {
         buffer[length - 1] = '\0';
     else
         buffer[length] = '\0';
-    first->full_text = i3string_from_utf8(buffer);
+    first->full_text = i3string_from_markup(buffer);
 }
 
 static bool read_json_input(unsigned char *input, int length) {