diff options
| author | Tony Crisci <tony@dubstepdish.com> | 2018-04-02 16:09:27 -0400 |
|---|---|---|
| committer | Tony Crisci <tony@dubstepdish.com> | 2018-04-02 16:09:27 -0400 |
| commit | d434da563239c43c5fe417ce83b23b417f2ab635 (patch) | |
| tree | e154daaf43c42d11c5afb8b7739ae6b52dd01215 /sway/ipc-server.c | |
| parent | d070244362f7d34bc15418154e52f8c968fbad41 (diff) | |
| parent | 0c0cc79282b5ce29616893977aca629f90521988 (diff) | |
| download | sway-d434da563239c43c5fe417ce83b23b417f2ab635.tar.xz | |
Merge branch 'wlroots' into split-containers
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); } |