[gnome-control-center] wacom: Specify monitor to use when calling run_calibration



commit af2c94ced56f89b778746411daad8698d69b653e
Author: Jason Gerecke <killertofu gmail com>
Date:   Fri Jan 13 13:30:03 2012 -0800

    wacom: Specify monitor to use when calling run_calibration
    
    Changes the signature of run_calibration to require the monitor
    that calibration should take place on.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=657423

 panels/wacom/cc-wacom-page.c |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)
---
diff --git a/panels/wacom/cc-wacom-page.c b/panels/wacom/cc-wacom-page.c
index 0a4234a..1156fd3 100644
--- a/panels/wacom/cc-wacom-page.c
+++ b/panels/wacom/cc-wacom-page.c
@@ -126,7 +126,8 @@ finish_calibration (CalibArea *area,
 
 static gboolean
 run_calibration (CcWacomPage *page,
-		 gint        *cal)
+		 gint        *cal,
+		 gint         monitor)
 {
 	XYinfo old_axis;
 
@@ -138,7 +139,7 @@ run_calibration (CcWacomPage *page,
 	old_axis.y_max = cal[3];
 
 	page->priv->area = calib_area_new (NULL,
-					   0, /* FIXME */
+					   monitor,
 					   finish_calibration,
 					   page,
 					   &old_axis,
@@ -190,7 +191,7 @@ calibrate_button_clicked_cb (GtkButton   *button,
 		g_free (device_cal);
 	}
 
-	run_calibration (page, calibration);
+	run_calibration (page, calibration, monitor);
 	gtk_widget_set_sensitive (GTK_WIDGET (button), FALSE);
 }
 



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