Merge branch 'master' into next

[i3/i3] / include / config_directives.h

diff --git a/include/config_directives.h b/include/config_directives.h
index 1faaa9734f135c7d06fff46c721f935f3f958549..e6b792c463906552711be4788393f21d83098e41 100644 (file)
--- a/include/config_directives.h
+++ b/include/config_directives.h
@@ -7,8 +7,7 @@
  * config_directives.h: all config storing functions (see config_parser.c)
  *
  */
-#ifndef I3_CONFIG_DIRECTIVES_H
-#define I3_CONFIG_DIRECTIVES_H
+#pragma once
 
 #include "config_parser.h"
 
@@ -62,6 +61,8 @@ CFGFUN(mode_binding, const char *bindtype, const char *modifiers, const char *ke
 
 CFGFUN(bar_font, const char *font);
 CFGFUN(bar_mode, const char *mode);
+CFGFUN(bar_hidden_state, const char *hidden_state);
+CFGFUN(bar_id, const char *bar_id);
 CFGFUN(bar_output, const char *output);
 CFGFUN(bar_verbose, const char *verbose);
 CFGFUN(bar_modifier, const char *modifier);
@@ -72,7 +73,6 @@ CFGFUN(bar_socket_path, const char *socket_path);
 CFGFUN(bar_tray_output, const char *output);
 CFGFUN(bar_color_single, const char *colorclass, const char *color);
 CFGFUN(bar_status_command, const char *command);
+CFGFUN(bar_binding_mode_indicator, const char *value);
 CFGFUN(bar_workspace_buttons, const char *value);
 CFGFUN(bar_finish);
-
-#endif