diff options
| author | Aaron Ouellette <aouellette2016@gmail.com> | 2016-03-18 17:09:11 -0400 |
|---|---|---|
| committer | Aaron Ouellette <aouellette2016@gmail.com> | 2016-03-18 17:09:11 -0400 |
| commit | 8af6a419ec6f4cfc596aabd5c820e7033cc760c4 (patch) | |
| tree | d958fae88ea43df2e707830e5f6ca9bf6975a491 /include | |
| parent | 133009b652e794bee083dbeb2fbdd2db787e84c6 (diff) | |
| parent | 378a45cec23b76732a19d0027e1bba3ef2bf3752 (diff) | |
Merge branch 'master' of git://github.com/SirCmpwn/sway into swaylock
Diffstat (limited to 'include')
| -rw-r--r-- | include/extensions.h | 1 | ||||
| -rw-r--r-- | include/workspace.h | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/include/extensions.h b/include/extensions.h index 164688ee..158a40a2 100644 --- a/include/extensions.h +++ b/include/extensions.h @@ -28,7 +28,6 @@ struct desktop_shell_state { list_t *panels; list_t *lock_surfaces; bool is_locked; - struct wlc_size panel_size; }; struct swaylock_state { diff --git a/include/workspace.h b/include/workspace.h index c69ccdbb..6911e3d4 100644 --- a/include/workspace.h +++ b/include/workspace.h @@ -7,7 +7,7 @@ extern char *prev_workspace_name; -char *workspace_next_name(void); +char *workspace_next_name(const char *output_name); swayc_t *workspace_create(const char*); swayc_t *workspace_by_name(const char*); swayc_t *workspace_by_number(const char*); |