From 037bdc4c5d8945088f431555eabd48ef292cf8d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kristian=20H=C3=B8gsberg?= Date: Thu, 29 Aug 2013 13:49:35 -0700 Subject: [PATCH] evdev: Don't parse config file again, use compositor->config --- src/evdev-touchpad.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/src/evdev-touchpad.c b/src/evdev-touchpad.c index 81acbd04..600df073 100644 --- a/src/evdev-touchpad.c +++ b/src/evdev-touchpad.c @@ -675,19 +675,15 @@ struct evdev_dispatch_interface touchpad_interface = { static void touchpad_parse_config(struct touchpad_dispatch *touchpad, double diagonal) { - struct weston_config *config; + struct weston_compositor *compositor = + touchpad->device->seat->compositor; struct weston_config_section *s; - int config_fd; - double constant_accel_factor; double min_accel_factor; double max_accel_factor; - config_fd = open_config_file("weston.ini"); - config = weston_config_parse(config_fd); - close(config_fd); - - s = weston_config_get_section(config, "touchpad", NULL, NULL); + s = weston_config_get_section(compositor->config, + "touchpad", NULL, NULL); weston_config_section_get_double(s, "constant_accel_factor", &constant_accel_factor, DEFAULT_CONSTANT_ACCEL_NUMERATOR);