mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-12-30 17:06:40 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' into feature/2842_TruncateMessage

Browse source
This commit is contained in:
Brian Ashworth 2018-10-16 21:31:29 -04:00 committed by GitHub
commit 3a5a8aa5ad
Failed to generate hash of commit
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
meson.build
View file

@ -114,7 +114,7 @@ if scdoc.found()
endforeach endforeach
endif endif
add_project_arguments('-DSYSCONFDIR="/@0@/@1@"'.format(prefix, sysconfdir), language : 'c') add_project_arguments('-DSYSCONFDIR="/@0@"'.format(sysconfdir), language : 'c')
version = get_option('sway-version') version = get_option('sway-version')
if version != '' if version != ''
@ -157,7 +157,7 @@ subdir('swaynag')
subdir('swaylock') subdir('swaylock')
config = configuration_data() config = configuration_data()
config.set('sysconfdir', join_paths(prefix, sysconfdir)) config.set('sysconfdir', sysconfdir)
config.set('datadir', join_paths(prefix, datadir)) config.set('datadir', join_paths(prefix, datadir))
config.set('prefix', prefix) config.set('prefix', prefix)

6
sway/commands/workspace.c
View file

@ -142,7 +142,11 @@ struct cmd_results *cmd_workspace(int argc, char **argv) {
strcasecmp(argv[0], "current") == 0) { strcasecmp(argv[0], "current") == 0) {
ws = workspace_by_name(argv[0]); ws = workspace_by_name(argv[0]);
} else if (strcasecmp(argv[0], "back_and_forth") == 0) { } else if (strcasecmp(argv[0], "back_and_forth") == 0) {
if (!(ws = workspace_by_name(argv[0])) && prev_workspace_name) { if (!prev_workspace_name) {
return cmd_results_new(CMD_INVALID, "workspace",
"There is no previous workspace");
}
if (!(ws = workspace_by_name(argv[0]))) {
ws = workspace_create(NULL, prev_workspace_name); ws = workspace_create(NULL, prev_workspace_name);
} }
} else { } else {