[gnome-flashback] input-settings: update two-finger scrolling before edge scrolling

[Alberts Muktupāvels <muktupavels src gnome org>]

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

    input-settings: 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

 .../libinput-settings/gf-input-settings.c          |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/gnome-flashback/libinput-settings/gf-input-settings.c 
b/gnome-flashback/libinput-settings/gf-input-settings.c
index a8bd6a6..2b8dcce 100644
--- a/gnome-flashback/libinput-settings/gf-input-settings.c
+++ b/gnome-flashback/libinput-settings/gf-input-settings.c
@@ -1203,8 +1203,8 @@ apply_device_settings (GfInputSettings *settings,
   update_touchpad_natural_scroll (settings, device);
   update_touchpad_tap_enabled (settings, device);
   update_touchpad_send_events (settings, device);
-  update_touchpad_edge_scroll (settings, device);
   update_touchpad_two_finger_scroll (settings, device);
+  update_touchpad_edge_scroll (settings, device);
   update_touchpad_click_method (settings, device);
 
   update_trackball_scroll_button (settings, device);