diff options
| author |  Zandr Martin <zandrmartin@gmail.com> | 2016-09-02 13:46:19 -0500 |
|---|---|---|
| committer | Zandr Martin <zandrmartin@gmail.com> | 2016-09-02 13:46:19 -0500 |
| commit | 79ffea328c992c5109406771a59a9f016d85970d (patch) | |
| tree | 5d965e72127f227ea0a38dc5c6e4fc14e08d9498 /swaybar/bar.c | |
| parent | refactor commands.c (diff) | |
| parent | Merge pull request #878 from lukaslihotzki/master (diff) | |
| download | sway-79ffea328c992c5109406771a59a9f016d85970d.tar.gz sway-79ffea328c992c5109406771a59a9f016d85970d.tar.zst sway-79ffea328c992c5109406771a59a9f016d85970d.zip | |
Merge branch 'master' of git://github.com/SirCmpwn/sway into commands-refactor
Diffstat (limited to 'swaybar/bar.c')
| -rw-r--r-- | swaybar/bar.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/swaybar/bar.c b/swaybar/bar.c index e3e53622..c6596864 100644 --- a/swaybar/bar.c +++ b/swaybar/bar.c | |||
| @@ -5,15 +5,14 @@ | |||
| 5 | #include <errno.h> | 5 | #include <errno.h> |
| 6 | #include <sys/wait.h> | 6 | #include <sys/wait.h> |
| 7 | #include <poll.h> | 7 | #include <poll.h> |
| 8 | 8 | #include "swaybar/ipc.h" | |
| 9 | #include "swaybar/render.h" | ||
| 10 | #include "swaybar/config.h" | ||
| 11 | #include "swaybar/status_line.h" | ||
| 12 | #include "swaybar/bar.h" | ||
| 9 | #include "ipc-client.h" | 13 | #include "ipc-client.h" |
| 10 | #include "list.h" | 14 | #include "list.h" |
| 11 | #include "log.h" | 15 | #include "log.h" |
| 12 | #include "bar/ipc.h" | ||
| 13 | #include "bar/render.h" | ||
| 14 | #include "bar/config.h" | ||
| 15 | #include "bar/status_line.h" | ||
| 16 | #include "bar/bar.h" | ||
| 17 | 16 | ||
| 18 | static void bar_init(struct bar *bar) { | 17 | static void bar_init(struct bar *bar) { |
| 19 | bar->config = init_config(); | 18 | bar->config = init_config(); |