Browse Source

use sysconfdir for installing bash completion script

cairo_optimizations
Alexandros Theodotou 3 years ago
parent
commit
9c93198ac9
Signed by: alex
GPG Key ID: 022EAE42313D70F3
  1. 13
      data/meson.build
  2. 6
      meson_options.txt
  3. 9
      src/gui/widgets/arranger.c

13
data/meson.build

@ -64,12 +64,11 @@ install_data ( @@ -64,12 +64,11 @@ install_data (
join_paths (
[datadir, 'mime/packages']))
if get_option ('install_bash_completion')
install_data (
'zrythm-completion.bash',
install_dir: '/etc/bash_completion.d',
install_mode: 'r--r--r--',
rename: 'zrythm')
endif
install_data (
'zrythm-completion.bash',
install_dir: join_paths (
sysconfdir, 'bash_completion.d'),
install_mode: 'r--r--r--',
rename: 'zrythm')
subdir('windows')

6
meson_options.txt

@ -107,12 +107,6 @@ option ( @@ -107,12 +107,6 @@ option (
transport meters. Packagers should turn this off and
set the font as a dependency instead''')
option (
'install_bash_completion',
type: 'boolean',
value: false,
description: 'Install bash completion')
option (
'windows_release',
type: 'boolean',

9
src/gui/widgets/arranger.c

@ -1985,8 +1985,7 @@ on_key_release_action ( @@ -1985,8 +1985,7 @@ on_key_release_action (
self->alt_held = 0;
}
if (self->action ==
UI_OVERLAY_ACTION_STARTING_MOVING)
if (ACTION_IS (STARTING_MOVING))
{
if (self->ctrl_held)
self->action =
@ -1995,13 +1994,11 @@ on_key_release_action ( @@ -1995,13 +1994,11 @@ on_key_release_action (
self->action =
UI_OVERLAY_ACTION_MOVING;
}
else if (self->action ==
UI_OVERLAY_ACTION_MOVING &&
else if (ACTION_IS (MOVING) &&
self->ctrl_held)
self->action =
UI_OVERLAY_ACTION_MOVING_COPY;
else if (self->action ==
UI_OVERLAY_ACTION_MOVING_COPY &&
else if (ACTION_IS (MOVING_COPY) &&
!self->ctrl_held)
self->action =
UI_OVERLAY_ACTION_MOVING;

Loading…
Cancel
Save