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 | add a manpage for swaylock (diff) | |
parent | Merge pull request #519 from mikkeloscar/maintain-exec-quotes (diff) | |
download | sway-8af6a419ec6f4cfc596aabd5c820e7033cc760c4.tar.gz sway-8af6a419ec6f4cfc596aabd5c820e7033cc760c4.tar.zst sway-8af6a419ec6f4cfc596aabd5c820e7033cc760c4.zip |
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 { | |||
28 | list_t *panels; | 28 | list_t *panels; |
29 | list_t *lock_surfaces; | 29 | list_t *lock_surfaces; |
30 | bool is_locked; | 30 | bool is_locked; |
31 | struct wlc_size panel_size; | ||
32 | }; | 31 | }; |
33 | 32 | ||
34 | struct swaylock_state { | 33 | 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 @@ | |||
7 | 7 | ||
8 | extern char *prev_workspace_name; | 8 | extern char *prev_workspace_name; |
9 | 9 | ||
10 | char *workspace_next_name(void); | 10 | char *workspace_next_name(const char *output_name); |
11 | swayc_t *workspace_create(const char*); | 11 | swayc_t *workspace_create(const char*); |
12 | swayc_t *workspace_by_name(const char*); | 12 | swayc_t *workspace_by_name(const char*); |
13 | swayc_t *workspace_by_number(const char*); | 13 | swayc_t *workspace_by_number(const char*); |