Merge branch 'master' into next

[i3/i3] / gtk-tree-watch.pl

diff --git a/gtk-tree-watch.pl b/gtk-tree-watch.pl
index b82d25d25c2d6fb2ce3836171c65873e69135861..f15d0c1814eca7e73a13133b08f29538ca42c44f 100755 (executable)
--- a/gtk-tree-watch.pl
+++ b/gtk-tree-watch.pl
@@ -116,7 +116,7 @@ my $layout_container = Gtk2::HBox->new(0, 0);
 $layout_sw->add_with_viewport($layout_container);
 
 sub copy_tree {
-    my $tree = $i3->get_workspaces->recv;
+    my $tree = $i3->get_tree->recv;
 
     # convert the tree back to json so we only rebuild/redraw when the tree is changed
     my $json = encode_json($tree);