Merge branch 'master' into next

2011-09-26 20:12:07 +01:00
parent 683bfa58d5 6ce2f4d394
commit db33da2258
1 changed files with 1 additions and 1 deletions
--- a/src/ipc.c
+++ b/src/ipc.c
@ -284,7 +284,7 @@ void dump_node(yajl_gen gen, struct Con *con, bool inplace_restart) {

    ystr("focus");
    y(array_open);
-    TAILQ_FOREACH(node, &(con->focus_head), nodes) {
+    TAILQ_FOREACH(node, &(con->focus_head), focused) {
        y(integer, (long int)node);
    }
    y(array_close);