ipc: s/floating-nodes/floating_nodes for consistency

This commit is contained in:
Michael Stapelberg 2010-11-21 16:34:45 +01:00
parent fcd8518d81
commit f53fafe100
4 changed files with 4 additions and 4 deletions

View File

@ -206,7 +206,7 @@ void dump_node(yajl_gen gen, struct Con *con, bool inplace_restart) {
} }
y(array_close); y(array_close);
ystr("floating-nodes"); ystr("floating_nodes");
y(array_open); y(array_open);
TAILQ_FOREACH(node, &(con->floating_head), floating_windows) { TAILQ_FOREACH(node, &(con->floating_head), floating_windows) {
dump_node(gen, node, inplace_restart); dump_node(gen, node, inplace_restart);

View File

@ -26,7 +26,7 @@ my $expected = {
focused => 0, focused => 0,
urgent => 0, urgent => 0,
border => 0, border => 0,
'floating-nodes' => ignore(), 'floating_nodes' => ignore(),
}; };
cmp_deeply($tree, $expected, 'root node OK'); cmp_deeply($tree, $expected, 'root node OK');

View File

@ -76,7 +76,7 @@ sub sum_nodes {
return 0 if !@{$nodes}; return 0 if !@{$nodes};
my @children = (map { @{$_->{nodes}} } @{$nodes}, my @children = (map { @{$_->{nodes}} } @{$nodes},
map { @{$_->{'floating-nodes'}} } @{$nodes}); map { @{$_->{'floating_nodes'}} } @{$nodes});
return @{$nodes} + sum_nodes(\@children); return @{$nodes} + sum_nodes(\@children);
} }

View File

@ -112,7 +112,7 @@ sub get_focused {
$lf = $focused[0]; $lf = $focused[0];
last unless defined($con->{focus}); last unless defined($con->{focus});
@focused = @{$con->{focus}}; @focused = @{$con->{focus}};
@cons = grep { $_->{id} == $lf } (@{$con->{nodes}}, @{$con->{'floating-nodes'}}); @cons = grep { $_->{id} == $lf } (@{$con->{nodes}}, @{$con->{'floating_nodes'}});
$con = $cons[0]; $con = $cons[0];
} }