[mutter] backends: Update two-finger scrolling before edge scrolling

[Bastien Nocera <hadess src gnome org>]

commit c977ba197e29c7ae2782bedea451142ecb803139
Author: Bastien Nocera <hadess hadess net>
Date:   Fri Aug 5 11:58:24 2016 +0200

    backends: Update two-finger scrolling before edge scrolling
    
    As whether edge scrolling is enabled depends on whether two-finger
    scrolling is disabled, make sure to update two-finger scrolling first.
    
    Note that this only fixes the problem on startup. Changing the
    settings in GSettings directly might cause an inconsistent state, but
    the main UI for this setting, gnome-control-center, makes sure to
    update two-finger scrolling before edge scrolling.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=769276

 src/backends/meta-input-settings.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/src/backends/meta-input-settings.c b/src/backends/meta-input-settings.c
index b1d7eec..8e5a31e 100644
--- a/src/backends/meta-input-settings.c
+++ b/src/backends/meta-input-settings.c
@@ -1247,8 +1247,8 @@ apply_device_settings (MetaInputSettings  *input_settings,
   update_touchpad_left_handed (input_settings, device);
   update_touchpad_tap_enabled (input_settings, device);
   update_touchpad_send_events (input_settings, device);
-  update_touchpad_edge_scroll (input_settings, device);
   update_touchpad_two_finger_scroll (input_settings, device);
+  update_touchpad_edge_scroll (input_settings, device);
   update_touchpad_click_method (input_settings, device);
 
   update_trackball_scroll_button (input_settings, device);