diff options
| author | Drew DeVault <sir@cmpwn.com> | 2018-11-01 13:01:15 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-01 13:01:15 +0100 |
| commit | 8ad06f0ec554da0ded551fc1b83f9cd0b3fa2a27 (patch) | |
| tree | 8399de2ba00a8a0dd57f49dfc30455c330500b54 /sway/ipc-server.c | |
| parent | 480b03b734e6d1d068859b254d8ace4fb07b2c54 (diff) | |
| parent | 9fc736f4e1804b06538191786500f927ba0cda13 (diff) | |
| download | sway-8ad06f0ec554da0ded551fc1b83f9cd0b3fa2a27.tar.xz | |
Merge pull request #3041 from RyanDwyer/marks-props-to-container
Move view marks properties to container struct
Diffstat (limited to 'sway/ipc-server.c')
| -rw-r--r-- | sway/ipc-server.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/sway/ipc-server.c b/sway/ipc-server.c index 21f431be..6466d263 100644 --- a/sway/ipc-server.c +++ b/sway/ipc-server.c @@ -563,11 +563,9 @@ static void ipc_get_workspaces_callback(struct sway_workspace *workspace, static void ipc_get_marks_callback(struct sway_container *con, void *data) { json_object *marks = (json_object *)data; - if (con->view && con->view->marks) { - for (int i = 0; i < con->view->marks->length; ++i) { - char *mark = (char *)con->view->marks->items[i]; - json_object_array_add(marks, json_object_new_string(mark)); - } + for (int i = 0; i < con->marks->length; ++i) { + char *mark = (char *)con->marks->items[i]; + json_object_array_add(marks, json_object_new_string(mark)); } } |