mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-11-26 18:01:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3218 from johnae/master

Browse source 
Fix json object ipc success return
This commit is contained in:
Brian Ashworth 2018-11-29 02:37:27 -05:00 committed by GitHub
parent 9d18d81d48 aef52154ec
commit cf1793b4f1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
sway/ipc-server.c
View file

@ -668,7 +668,7 @@ void ipc_client_handle_command(struct ipc_client *client) {
// TODO: Check if they're permitted to use these events // TODO: Check if they're permitted to use these events
struct json_object *request = json_tokener_parse(buf); struct json_object *request = json_tokener_parse(buf);
if (request == NULL) { if (request == NULL) {
const char msg[] = "[{\"success\": false}]"; const char msg[] = "{\"success\": false}";
client_valid = ipc_send_reply(client, msg, strlen(msg)); client_valid = ipc_send_reply(client, msg, strlen(msg));
wlr_log(WLR_INFO, "Failed to parse subscribe request"); wlr_log(WLR_INFO, "Failed to parse subscribe request");
goto exit_cleanup; goto exit_cleanup;
@ -696,7 +696,7 @@ void ipc_client_handle_command(struct ipc_client *client) {
client->subscribed_events |= event_mask(IPC_EVENT_TICK); client->subscribed_events |= event_mask(IPC_EVENT_TICK);
is_tick = true; is_tick = true;
} else { } else {
const char msg[] = "[{\"success\": false}]"; const char msg[] = "{\"success\": false}";
client_valid = ipc_send_reply(client, msg, strlen(msg)); client_valid = ipc_send_reply(client, msg, strlen(msg));
json_object_put(request); json_object_put(request);
wlr_log(WLR_INFO, "Unsupported event type in subscribe request"); wlr_log(WLR_INFO, "Unsupported event type in subscribe request");
@ -705,7 +705,7 @@ void ipc_client_handle_command(struct ipc_client *client) {
} }
json_object_put(request); json_object_put(request);
const char msg[] = "[{\"success\": true}]"; const char msg[] = "{\"success\": true}";
client_valid = ipc_send_reply(client, msg, strlen(msg)); client_valid = ipc_send_reply(client, msg, strlen(msg));
if (is_tick) { if (is_tick) {
client->current_command = IPC_EVENT_TICK; client->current_command = IPC_EVENT_TICK;