diff options
| author | emersion <contact@emersion.fr> | 2018-04-02 15:30:58 -0400 |
|---|---|---|
| committer | emersion <contact@emersion.fr> | 2018-04-02 15:30:58 -0400 |
| commit | a4a241697ae591289d7c14eff972e1ef787216e2 (patch) | |
| tree | d82d3c3eba2946670aa634a62d03feb7102f0bf8 /sway/ipc-server.c | |
| parent | 2f64ce86c47efb2ee4c0e3a3c2b31307d21404d9 (diff) | |
| parent | 0c0cc79282b5ce29616893977aca629f90521988 (diff) | |
| download | sway-a4a241697ae591289d7c14eff972e1ef787216e2.tar.xz | |
Merge branch 'wlroots' into view-redesign
Diffstat (limited to 'sway/ipc-server.c')
| -rw-r--r-- | sway/ipc-server.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sway/ipc-server.c b/sway/ipc-server.c index 869f1ed0..df5fb699 100644 --- a/sway/ipc-server.c +++ b/sway/ipc-server.c @@ -388,8 +388,8 @@ static void ipc_get_workspaces_callback(struct sway_container *workspace, // override the default focused indicator because // it's set differently for the get_workspaces reply struct sway_seat *seat = - sway_input_manager_get_default_seat(input_manager); - struct sway_container *focused_ws = sway_seat_get_focus(seat); + input_manager_get_default_seat(input_manager); + struct sway_container *focused_ws = seat_get_focus(seat); if (focused_ws != NULL && focused_ws->type != C_WORKSPACE) { focused_ws = container_parent(focused_ws, C_WORKSPACE); } @@ -399,7 +399,7 @@ static void ipc_get_workspaces_callback(struct sway_container *workspace, json_object_new_boolean(focused)); json_object_array_add((json_object *)data, workspace_json); - focused_ws = sway_seat_get_focus_inactive(seat, workspace->parent); + focused_ws = seat_get_focus_inactive(seat, workspace->parent); if (focused_ws->type != C_WORKSPACE) { focused_ws = container_parent(focused_ws, C_WORKSPACE); } |