[gnome-control-center/gnome-3-24] wacom: Correct order of area calibration values

[Carlos Garnacho <carlosg src gnome org>]

commit 83bdd852aecb8d353a58a5ec701a6bc1324b4638
Author: Jason Gerecke <killertofu gmail com>
Date:   Tue Jun 20 15:55:26 2017 -0700

    wacom: Correct order of area calibration values
    
    Commit cf408c27b0 changed how the values stored in the "area" key were
    calculated in order be compatible with its updated schema. Unfortunately,
    it overlooked the fact that updated schema also changed the order of the
    values from "left, top, right, bottom" to "left, right, top, bottom".
    Because of this, corrections intended to be applied to the top and right
    screen edges were swapped. This can cause a noticible cursor offset to
    occur after finishing calibration.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=784009

 panels/wacom/cc-wacom-page.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/panels/wacom/cc-wacom-page.c b/panels/wacom/cc-wacom-page.c
index 13b0729..b16d74f 100644
--- a/panels/wacom/cc-wacom-page.c
+++ b/panels/wacom/cc-wacom-page.c
@@ -169,7 +169,7 @@ set_calibration (CcWacomDevice  *device,
 
        g_free (tmp);
 
-       g_debug ("Setting area top (%f, %f) bottom (%f, %f) (last used resolution: %d x %d)",
+       g_debug ("Setting area to %f, %f, %f, %f (left/right/top/bottom) (last used resolution: %d x %d)",
                 cal[0], cal[1], cal[2], cal[3],
                 display_width, display_height);
 }
@@ -187,8 +187,8 @@ finish_calibration (CalibArea *area,
        if (calib_area_finish (area)) {
                calib_area_get_padding (area, &axis);
                cal[0] = axis.x_min;
-               cal[1] = axis.y_min;
-               cal[2] = axis.x_max;
+               cal[1] = axis.x_max;
+               cal[2] = axis.y_min;
                cal[3] = axis.y_max;
 
                calib_area_get_display_size (area, &display_width, &display_height);