diff options
author | taiyu <taiyu.len@gmail.com> | 2015-09-12 02:38:03 -0700 |
---|---|---|
committer | taiyu <taiyu.len@gmail.com> | 2015-09-12 02:38:03 -0700 |
commit | e1d18e42a8f3a597b9bf5f1bb2ab6c346e4e7983 (patch) | |
tree | 8a8ac30c539f4a63bb249b8c5e27e724a4241c9f /sway/ipc.c | |
parent | Merge pull request #177 from taiyu-len/master (diff) | |
download | sway-e1d18e42a8f3a597b9bf5f1bb2ab6c346e4e7983.tar.gz sway-e1d18e42a8f3a597b9bf5f1bb2ab6c346e4e7983.tar.zst sway-e1d18e42a8f3a597b9bf5f1bb2ab6c346e4e7983.zip |
new_workspace null behavior + testmap functions + regex
Diffstat (limited to 'sway/ipc.c')
-rw-r--r-- | sway/ipc.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -207,7 +207,7 @@ void ipc_client_handle_command(struct ipc_client *client) { | |||
207 | case IPC_GET_WORKSPACES: | 207 | case IPC_GET_WORKSPACES: |
208 | { | 208 | { |
209 | json_object *workspaces = json_object_new_array(); | 209 | json_object *workspaces = json_object_new_array(); |
210 | container_map(&root_container, ipc_get_workspaces_callback, workspaces); | 210 | swayc_map(ipc_get_workspaces_callback, workspaces); |
211 | const char *json_string = json_object_to_json_string(workspaces); | 211 | const char *json_string = json_object_to_json_string(workspaces); |
212 | ipc_send_reply(client, json_string, (uint32_t) strlen(json_string)); | 212 | ipc_send_reply(client, json_string, (uint32_t) strlen(json_string)); |
213 | json_object_put(workspaces); // free | 213 | json_object_put(workspaces); // free |
@@ -216,7 +216,7 @@ void ipc_client_handle_command(struct ipc_client *client) { | |||
216 | case IPC_GET_OUTPUTS: | 216 | case IPC_GET_OUTPUTS: |
217 | { | 217 | { |
218 | json_object *outputs = json_object_new_array(); | 218 | json_object *outputs = json_object_new_array(); |
219 | container_map(&root_container, ipc_get_outputs_callback, outputs); | 219 | swayc_map(ipc_get_outputs_callback, outputs); |
220 | const char *json_string = json_object_to_json_string(outputs); | 220 | const char *json_string = json_object_to_json_string(outputs); |
221 | ipc_send_reply(client, json_string, (uint32_t) strlen(json_string)); | 221 | ipc_send_reply(client, json_string, (uint32_t) strlen(json_string)); |
222 | json_object_put(outputs); // free | 222 | json_object_put(outputs); // free |