Merge branch 'master' into next

[i3/i3] / include / commands_parser.h

diff --git a/include/commands_parser.h b/include/commands_parser.h
index 6ff8d54ea81a1ccdff2567fb3d9cc16ebec19d8d..37c4d4b1705459da0894d8ef2f0c4e0390dd9d2e 100644 (file)
--- a/include/commands_parser.h
+++ b/include/commands_parser.h
@@ -25,6 +25,11 @@ struct CommandResult {
     /* The JSON generator to append a reply to. */
     yajl_gen json_gen;
 
+    /* The next state to transition to. Passed to the function so that we can
+     * determine the next state as a result of a function call, like
+     * cfg_criteria_pop_state() does. */
+    int next_state;
+
     /* Whether the command requires calling tree_render. */
     bool needs_tree_render;
 };