From 35143dbbd15ab4781cfd586935f68bb969524086 Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Tue, 4 Nov 2014 09:54:07 +0100 Subject: [PATCH] touchpad: s/config/config_natural/ To avoid confusion with scroll mode configuration. Signed-off-by: Hans de Goede Reviewed-by: Peter Hutterer Signed-off-by: Peter Hutterer --- src/evdev-mt-touchpad.c | 10 +++++----- src/evdev-mt-touchpad.h | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/evdev-mt-touchpad.c b/src/evdev-mt-touchpad.c index bbad713c..512131bd 100644 --- a/src/evdev-mt-touchpad.c +++ b/src/evdev-mt-touchpad.c @@ -949,12 +949,12 @@ static int tp_init_scroll(struct tp_dispatch *tp) { - tp->scroll.config.has = tp_scroll_config_natural_has; - tp->scroll.config.set_enabled = tp_scroll_config_natural_set; - tp->scroll.config.get_enabled = tp_scroll_config_natural_get; - tp->scroll.config.get_default_enabled = tp_scroll_config_natural_get_default; + tp->scroll.config_natural.has = tp_scroll_config_natural_has; + tp->scroll.config_natural.set_enabled = tp_scroll_config_natural_set; + tp->scroll.config_natural.get_enabled = tp_scroll_config_natural_get; + tp->scroll.config_natural.get_default_enabled = tp_scroll_config_natural_get_default; tp->scroll.natural_scrolling_enabled = false; - tp->device->base.config.natural_scroll = &tp->scroll.config; + tp->device->base.config.natural_scroll = &tp->scroll.config_natural; /* In mm for touchpads with valid resolution, see tp_init_accel() */ tp->device->scroll.threshold = 5.0; diff --git a/src/evdev-mt-touchpad.h b/src/evdev-mt-touchpad.h index 91f6e4ae..baa51a36 100644 --- a/src/evdev-mt-touchpad.h +++ b/src/evdev-mt-touchpad.h @@ -202,7 +202,7 @@ struct tp_dispatch { } buttons; /* physical buttons */ struct { - struct libinput_device_config_natural_scroll config; + struct libinput_device_config_natural_scroll config_natural; bool natural_scrolling_enabled; } scroll;