summaryrefslogtreecommitdiff
path: root/sway/ipc.c
diff options
context:
space:
mode:
authorDrew DeVault <[email protected]>2015-09-12 10:29:11 -0400
committerDrew DeVault <[email protected]>2015-09-12 10:29:11 -0400
commit9c8f1fb9649c5673cd6b42230c0784f099a62db7 (patch)
treebb5eccfddb8b8d56e387327908490daeca2c42a7 /sway/ipc.c
parentf5343adae4d631e4cdade7869b4d73fc97b4ac5f (diff)
parentf76f9e2eea15ee4606c23139e9a4c8ce41a4ab18 (diff)
Merge pull request #179 from taiyu-len/master
new_workspace null behavior + testmap functions + regex
Diffstat (limited to 'sway/ipc.c')
-rw-r--r--sway/ipc.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sway/ipc.c b/sway/ipc.c
index abf2ed0c..86518bc6 100644
--- a/sway/ipc.c
+++ b/sway/ipc.c
@@ -207,7 +207,7 @@ void ipc_client_handle_command(struct ipc_client *client) {
case IPC_GET_WORKSPACES:
{
json_object *workspaces = json_object_new_array();
- container_map(&root_container, ipc_get_workspaces_callback, workspaces);
+ swayc_map(ipc_get_workspaces_callback, workspaces);
const char *json_string = json_object_to_json_string(workspaces);
ipc_send_reply(client, json_string, (uint32_t) strlen(json_string));
json_object_put(workspaces); // free
@@ -216,7 +216,7 @@ void ipc_client_handle_command(struct ipc_client *client) {
case IPC_GET_OUTPUTS:
{
json_object *outputs = json_object_new_array();
- container_map(&root_container, ipc_get_outputs_callback, outputs);
+ swayc_map(ipc_get_outputs_callback, outputs);
const char *json_string = json_object_to_json_string(outputs);
ipc_send_reply(client, json_string, (uint32_t) strlen(json_string));
json_object_put(outputs); // free