Merge branch 'next' into master

[i3/i3] / i3bar / include / configuration.h

diff --git a/i3bar/include/configuration.h b/i3bar/include/configuration.h
index 61cac7f6bdcab344de7cbaaa9dfc5f1a8c4fc1f3..b86da2e040bad6c2191e7cbcd3df3ef1f9cdfad9 100644 (file)
--- a/i3bar/include/configuration.h
+++ b/i3bar/include/configuration.h
@@ -41,17 +41,18 @@ typedef struct tray_output_t {
 } tray_output_t;
 
 typedef struct config_t {
-    int modifier;
+    uint32_t modifier;
 
     TAILQ_HEAD(bindings_head, binding_t)
     bindings;
 
     position_t position;
-    int verbose;
+    bool verbose;
     struct xcb_color_strings_t colors;
     bool disable_binding_mode_indicator;
     bool disable_ws;
     bool strip_ws_numbers;
+    bool strip_ws_name;
     char *bar_id;
     char *command;
     char *fontname;