diff options
author | Brian Ashworth <bosrsf04@gmail.com> | 2019-01-14 11:44:18 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-01-14 11:44:18 -0500 |
commit | 15cd8b6a86295a445a1037afd0028b1226a14c82 (patch) | |
tree | 56332b9c150459beb5aef94605372ef179ec8854 /sway/commands/bar/tray_bindsym.c | |
parent | 64ef9366733d6d332a24897f72eba90ba2adca1e (diff) | |
parent | 2a684cad5fc8e12a8e47a7fd00e2b7c66b43afb0 (diff) | |
download | sway-15cd8b6a86295a445a1037afd0028b1226a14c82.tar.xz |
Merge pull request #3403 from mstoeckl/ipcleanup
Remove 'input' field of IPC command return json
Diffstat (limited to 'sway/commands/bar/tray_bindsym.c')
-rw-r--r-- | sway/commands/bar/tray_bindsym.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sway/commands/bar/tray_bindsym.c b/sway/commands/bar/tray_bindsym.c index ad413446..4e57e35e 100644 --- a/sway/commands/bar/tray_bindsym.c +++ b/sway/commands/bar/tray_bindsym.c @@ -12,7 +12,7 @@ struct cmd_results *bar_cmd_tray_bindsym(int argc, char **argv) { } if (!config->current_bar) { - return cmd_results_new(CMD_FAILURE, "tray_bindsym", "No bar defined."); + return cmd_results_new(CMD_FAILURE, "No bar defined."); } int button = 0; @@ -21,7 +21,7 @@ struct cmd_results *bar_cmd_tray_bindsym(int argc, char **argv) { button = argv[0][strlen("button")] - '0'; } if (button < 1 || button > 9) { - return cmd_results_new(CMD_FAILURE, "tray_bindsym", + return cmd_results_new(CMD_FAILURE, "[Bar %s] Only buttons 1 to 9 are supported", config->current_bar->id); } @@ -42,14 +42,14 @@ struct cmd_results *bar_cmd_tray_bindsym(int argc, char **argv) { wlr_log(WLR_DEBUG, "[Bar %s] Binding button %d to %s", config->current_bar->id, button, commands[i]); config->current_bar->tray_bindings[button] = commands[i]; - return cmd_results_new(CMD_SUCCESS, NULL, NULL); + return cmd_results_new(CMD_SUCCESS, NULL); } } - return cmd_results_new(CMD_INVALID, "tray_bindsym", + return cmd_results_new(CMD_INVALID, "[Bar %s] Invalid command %s", config->current_bar->id, argv[1]); #else - return cmd_results_new(CMD_INVALID, "tray_bindsym", + return cmd_results_new(CMD_INVALID, "Sway has been compiled without tray support"); #endif } |