1 files changed, 15 insertions, 7 deletions

diff --git a/sway/config/bar.c b/sway/config/bar.c
index 7bca5f49..701bf051 100644
--- a/sway/config/bar.c
+++ b/sway/config/bar.c
@@ -1,5 +1,4 @@
 #define _POSIX_C_SOURCE 200809L
-#define _XOPEN_SOURCE 700
 #include <stdio.h>
 #include <stdbool.h>
 #include <stdlib.h>
@@ -13,6 +12,7 @@
 #include <signal.h>
 #include "sway/config.h"
 #include "sway/output.h"
+#include "config.h"
 #include "stringop.h"
 #include "list.h"
 #include "log.h"
@@ -50,13 +50,10 @@ void free_bar_config(struct bar_config *bar) {
         free(bar->font);
         free(bar->separator_symbol);
         for (int i = 0; i < bar->bindings->length; i++) {
-                struct bar_binding *binding = bar->bindings->items[i];
-                free_bar_binding(binding);
+                free_bar_binding(bar->bindings->items[i]);
         }
         list_free(bar->bindings);
-        if (bar->outputs) {
-                free_flat_list(bar->outputs);
-        }
+        list_free_items_and_destroy(bar->outputs);
         if (bar->pid != 0) {
                 terminate_swaybar(bar->pid);
         }
@@ -81,6 +78,10 @@ void free_bar_config(struct bar_config *bar) {
         free(bar->colors.binding_mode_border);
         free(bar->colors.binding_mode_bg);
         free(bar->colors.binding_mode_text);
+#if HAVE_TRAY
+        list_free_items_and_destroy(bar->tray_outputs);
+        free(bar->icon_theme);
+#endif
         free(bar);
 }
 
@@ -95,15 +96,18 @@ struct bar_config *default_bar_config(void) {
         bar->pango_markup = false;
         bar->swaybar_command = NULL;
         bar->font = NULL;
-        bar->height = -1;
+        bar->height = 0;
         bar->workspace_buttons = true;
         bar->wrap_scroll = false;
         bar->separator_symbol = NULL;
         bar->strip_workspace_numbers = false;
+        bar->strip_workspace_name = false;
         bar->binding_mode_indicator = true;
         bar->verbose = false;
         bar->pid = 0;
         bar->modifier = get_modifier_mask_by_name("Mod4");
+        bar->status_padding = 1;
+        bar->status_edge_padding = 3;
         if (!(bar->mode = strdup("dock"))) {
                goto cleanup;
         }
@@ -168,6 +172,10 @@ struct bar_config *default_bar_config(void) {
         bar->colors.binding_mode_bg = NULL;
         bar->colors.binding_mode_text = NULL;
 
+#if HAVE_TRAY
+        bar->tray_padding = 2;
+#endif
+
         list_add(config->bars, bar);
         return bar;
 cleanup: