Re: [hackers] [slock][patch] configure bell amplitude

From: Markus Teich <markus.teich_AT_stusta.mhn.de>
Date: Sat, 2 Dec 2017 23:29:11 +0100

Heyho M,

Please rebase your patch to apply on master:

        $ git am patches.mbox/
        Applying: configure bell amplitude
        error: patch failed: config.def.h:10
        error: config.def.h: patch does not apply
        error: patch failed: slock.c:165
        error: slock.c: patch does not apply
        Patch failed at 0001 configure bell amplitude

Thanks.

--Markus


M Farkas-Dyck wrote:
> From 8cb17e8f16e1e87c8719c6b76dd1c87ab28c30e6 Mon Sep 17 00:00:00 2001
> From: M Farkas-Dyck <strake888_AT_gmail.com>
> Date: Thu, 30 Nov 2017 11:44:03 -0800
> Subject: [PATCH] configure bell amplitude
>
> ---
> config.def.h | 3 +++
> slock.c | 2 +-
> 2 files changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/config.def.h b/config.def.h
> index 9855e21..64a944d 100644
> --- a/config.def.h
> +++ b/config.def.h
> _AT_@ -10,3 +10,6 @@ static const char *colorname[NUMCOLS] = {
>
> /* treat a cleared input like a wrong password (color) */
> static const int failonclear = 1;
> +
> +/* bell amplitude */
> +static const int bell = 100;
> diff --git a/slock.c b/slock.c
> index 5ae738c..bb3b713 100644
> --- a/slock.c
> +++ b/slock.c
> _AT_@ -165,7 +165,7 @@ readpw(Display *dpy, struct xrandr *rr, struct lock **locks, int nscreens,
> else
> running = !!strcmp(inputhash, hash);
> if (running) {
> - XBell(dpy, 100);
> + XBell(dpy, bell);
> failure = 1;
> }
> explicit_bzero(&passwd, sizeof(passwd));
> --
> 2.14.3
>
Received on Sat Dec 02 2017 - 23:29:11 CET