[gnome-control-center/wip/carlosg/calibrator-fixes: 36/45] wacom: Drop unused API




commit 3d4d78558878c6c2a7065830b8ebe781be10b0ea
Author: Carlos Garnacho <carlosg gnome org>
Date:   Sat Feb 12 00:26:59 2022 +0100

    wacom: Drop unused API
    
    This function was only used for logging purposes, we can do
    without it.

 panels/wacom/calibrator/calibrator-gui.c |  9 ---------
 panels/wacom/calibrator/calibrator-gui.h |  4 ----
 panels/wacom/cc-wacom-page.c             | 12 ++----------
 3 files changed, 2 insertions(+), 23 deletions(-)
---
diff --git a/panels/wacom/calibrator/calibrator-gui.c b/panels/wacom/calibrator/calibrator-gui.c
index 1c9d6f4d9..810044dd7 100644
--- a/panels/wacom/calibrator/calibrator-gui.c
+++ b/panels/wacom/calibrator/calibrator-gui.c
@@ -407,15 +407,6 @@ calib_area_free (CalibArea *area)
   g_free (area);
 }
 
-void
-calib_area_get_display_size (CalibArea *area, gint *width, gint *height)
-{
-  g_return_if_fail (area != NULL);
-
-  *width = area->display_width;
-  *height = area->display_height;
-}
-
 void
 calib_area_get_axis (CalibArea *area,
                      XYinfo    *new_axis,
diff --git a/panels/wacom/calibrator/calibrator-gui.h b/panels/wacom/calibrator/calibrator-gui.h
index 6e0dc7a08..400aa101a 100644
--- a/panels/wacom/calibrator/calibrator-gui.h
+++ b/panels/wacom/calibrator/calibrator-gui.h
@@ -51,10 +51,6 @@ gboolean calib_area_finish (CalibArea *area);
 
 void calib_area_free (CalibArea *area);
 
-void calib_area_get_display_size (CalibArea *area,
-                                 gint      *width,
-                                 gint      *height);
-
 void calib_area_get_axis (CalibArea *area,
                           XYinfo    *new_axis,
                           gboolean  *swap_xy);
diff --git a/panels/wacom/cc-wacom-page.c b/panels/wacom/cc-wacom-page.c
index b08d4cebc..c90873696 100644
--- a/panels/wacom/cc-wacom-page.c
+++ b/panels/wacom/cc-wacom-page.c
@@ -113,8 +113,6 @@ get_layout_type (CcWacomDevice *device)
 
 static void
 set_calibration (CcWacomDevice  *device,
-                 const gint      display_width,
-                 const gint      display_height,
                  gdouble        *cal,
                  gsize           ncal,
                  GSettings      *settings)
@@ -139,9 +137,8 @@ set_calibration (CcWacomDevice  *device,
        array = g_variant_new_array (G_VARIANT_TYPE_DOUBLE, tmp, nvalues);
        g_settings_set_value (settings, "area", array);
 
-       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);
+       g_debug ("Setting area to %f, %f, %f, %f (left/right/top/bottom)",
+                cal[0], cal[1], cal[2], cal[3]);
 }
 
 static void
@@ -151,7 +148,6 @@ finish_calibration (CalibArea *area,
        CcWacomPage *page = (CcWacomPage *) user_data;
        XYinfo axis;
        gdouble cal[4];
-       gint display_width, display_height;
 
        if (calib_area_finish (area)) {
                calib_area_get_padding (area, &axis);
@@ -160,11 +156,7 @@ finish_calibration (CalibArea *area,
                cal[2] = axis.y_min;
                cal[3] = axis.y_max;
 
-               calib_area_get_display_size (area, &display_width, &display_height);
-
                set_calibration (page->stylus,
-                                display_width,
-                                display_height,
                                 cal, 4, page->wacom_settings);
        } else {
                /* Reset the old values */


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]