[PATCH weston] libinput: default to INFO log level

[Pekka Paalanen]

On Fri, 12 Sep 2014 12:11:21 +0300
Pekka Paalanen <ppaalanen at gmail.com> wrote:

> From: Pekka Paalanen <pekka.paalanen at collabora.co.uk>
> 
> Set the default logging level from libinput to INFO. This matches better
> the behaviour of the old input backend, and prints the found input
> devices into Weston's log.
> 
> Signed-off-by: Pekka Paalanen <pekka.paalanen at collabora.co.uk>
> ---
>  src/libinput-seat.c | 16 ++++++++--------
>  1 file changed, 8 insertions(+), 8 deletions(-)
> 
> diff --git a/src/libinput-seat.c b/src/libinput-seat.c
> index 09cf7c7..ef2d804 100644
> --- a/src/libinput-seat.c
> +++ b/src/libinput-seat.c
> @@ -260,9 +260,10 @@ libinput_log_func(struct libinput *libinput,
>  }
>  
>  int
> -udev_input_init(struct udev_input *input, struct weston_compositor *c, struct udev *udev,
> -		const char *seat_id)
> +udev_input_init(struct udev_input *input, struct weston_compositor *c,
> +		struct udev *udev, const char *seat_id)
>  {
> +	enum libinput_log_priority priority = LIBINPUT_LOG_PRIORITY_INFO;
>  	const char *log_priority = NULL;
>  
>  	memset(input, 0, sizeof *input);
> @@ -281,17 +282,16 @@ udev_input_init(struct udev_input *input, struct weston_compositor *c, struct ud
>  
>  	if (log_priority) {
>  		if (strcmp(log_priority, "debug") == 0) {
> -			libinput_log_set_priority(input->libinput,
> -						  LIBINPUT_LOG_PRIORITY_DEBUG);
> +			priority = LIBINPUT_LOG_PRIORITY_DEBUG;
>  		} else if (strcmp(log_priority, "info") == 0) {
> -			libinput_log_set_priority(input->libinput,
> -						  LIBINPUT_LOG_PRIORITY_INFO);
> +			priority = LIBINPUT_LOG_PRIORITY_INFO;
>  		} else if (strcmp(log_priority, "error") == 0) {
> -			libinput_log_set_priority(input->libinput,
> -						  LIBINPUT_LOG_PRIORITY_ERROR);
> +			priority = LIBINPUT_LOG_PRIORITY_ERROR;
>  		}
>  	}
>  
> +	libinput_log_set_priority(input->libinput, priority);
> +
>  	if (libinput_udev_assign_seat(input->libinput, seat_id) != 0) {
>  		libinput_unref(input->libinput);
>  		return -1;

Pushed with Jonas' ack.


Thanks,
pq