aboutsummaryrefslogtreecommitdiffstats
path: root/swaybar/ipc.c
diff options
context:
space:
mode:
authorLibravatar Drew DeVault <sir@cmpwn.com>2018-04-25 11:00:56 +0200
committerLibravatar GitHub <noreply@github.com>2018-04-25 11:00:56 +0200
commitc54097428a8f36e456d203d986d76702bd339066 (patch)
treeec248905f4c73d8f52c3e2c08ce26decbda2d704 /swaybar/ipc.c
parentUpdate wording about unmanaged/unmapped views (diff)
parentMerge pull request #1861 from emersion/swaybar-memory-leaks (diff)
downloadsway-c54097428a8f36e456d203d986d76702bd339066.tar.gz
sway-c54097428a8f36e456d203d986d76702bd339066.tar.zst
sway-c54097428a8f36e456d203d986d76702bd339066.zip
Merge branch 'master' into criteria-commands
Diffstat (limited to 'swaybar/ipc.c')
-rw-r--r--swaybar/ipc.c13
1 files changed, 2 insertions, 11 deletions
diff --git a/swaybar/ipc.c b/swaybar/ipc.c
index ed5d9a31..959fa095 100644
--- a/swaybar/ipc.c
+++ b/swaybar/ipc.c
@@ -216,15 +216,6 @@ static void ipc_parse_config(
216 json_object_put(bar_config); 216 json_object_put(bar_config);
217} 217}
218 218
219static void free_workspaces(struct wl_list *list) {
220 struct swaybar_workspace *ws, *tmp;
221 wl_list_for_each_safe(ws, tmp, list, link) {
222 wl_list_remove(&ws->link);
223 free(ws->name);
224 free(ws);
225 }
226}
227
228void ipc_get_workspaces(struct swaybar *bar) { 219void ipc_get_workspaces(struct swaybar *bar) {
229 bar->focused_output = NULL; 220 bar->focused_output = NULL;
230 struct swaybar_output *output; 221 struct swaybar_output *output;
@@ -290,8 +281,8 @@ static void ipc_get_outputs(struct swaybar *bar) {
290 continue; 281 continue;
291 } 282 }
292 if (bar->config->all_outputs) { 283 if (bar->config->all_outputs) {
293 struct config_output *coutput = calloc( 284 struct config_output *coutput =
294 1, sizeof(struct config_output)); 285 calloc(1, sizeof(struct config_output));
295 coutput->name = strdup(name); 286 coutput->name = strdup(name);
296 coutput->index = i; 287 coutput->index = i;
297 wl_list_insert(&bar->config->outputs, &coutput->link); 288 wl_list_insert(&bar->config->outputs, &coutput->link);