[gnome-control-center] wacom: Identation fixes
- From: Bastien Nocera <hadess src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-control-center] wacom: Identation fixes
- Date: Thu, 12 Jan 2012 15:42:10 +0000 (UTC)
commit f256fe00964103c8428f7c795a95930799cd7057
Author: Bastien Nocera <hadess hadess net>
Date: Thu Jan 12 15:23:53 2012 +0000
wacom: Identation fixes
panels/wacom/cc-wacom-page.c | 73 ++++++++++++++++++++---------------------
1 files changed, 36 insertions(+), 37 deletions(-)
---
diff --git a/panels/wacom/cc-wacom-page.c b/panels/wacom/cc-wacom-page.c
index 5300313..26e104b 100644
--- a/panels/wacom/cc-wacom-page.c
+++ b/panels/wacom/cc-wacom-page.c
@@ -116,8 +116,8 @@ eraser_feel_value_changed_cb (GtkRange *range, gpointer user_data)
static void
get_calibration (gint ** cal,
- gsize * ncal,
- GSettings * settings)
+ gsize * ncal,
+ GSettings * settings)
{
gconstpointer res;
@@ -164,8 +164,7 @@ run_calibration (gint *cal,
gboolean swap_xy;
struct Calib calibrator;
- if (ncal != 4)
- {
+ if (ncal != 4) {
g_warning("Unable to run calibration. Got %"G_GSIZE_FORMAT" items; expected %d.\n", ncal, 4);
return FALSE;
}
@@ -178,11 +177,10 @@ run_calibration (gint *cal,
calibrator.old_axis.y_max = cal[3];
/* !!NOTE!! This call blocks on the calibration
- * !!NOTE!! process. It will be several seconds
- * !!NOTE!! before this returns.
- */
- if(run_gui(&calibrator, &axis, &swap_xy))
- {
+ * !!NOTE!! process. It will be several seconds
+ * !!NOTE!! before this returns.
+ */
+ if (run_gui (&calibrator, &axis, &swap_xy)) {
cal[0] = axis.x_min;
cal[1] = axis.y_min;
cal[2] = axis.x_max;
@@ -197,35 +195,36 @@ static void
calibrate_button_clicked_cb (GtkButton *button,
CcWacomPage *page)
{
- int i, calibration[4];
- int *current;
- gsize s;
-
- get_calibration (¤t, &s, page->priv->wacom_settings);
- if (s != 4)
- {
- g_warning("Device calibration property has wrong length. Got %"G_GSIZE_FORMAT" items; expected %d.\n", s, 4);
- g_free (current);
- return;
- }
-
- for (i = 0; i < 4; i++)
- calibration[i] = current[i];
-
- if (calibration[0] == -1 && calibration[1] == -1 && calibration[2] == -1 && calibration[3] == -1) {
- gint *device_cal;
- device_cal = gsd_wacom_device_get_area(page->priv->stylus);
- for (i = 0; i < 4; i++)
- calibration[i] = device_cal[i];
- g_free (device_cal);
- }
-
- if (run_calibration(calibration, 4))
- set_calibration(calibration, 4, page->priv->wacom_settings);
-
- g_free (current);
-}
+ int i, calibration[4];
+ int *current;
+ gsize s;
+
+ get_calibration (¤t, &s, page->priv->wacom_settings);
+ if (s != 4) {
+ g_warning("Device calibration property has wrong length. Got %"G_GSIZE_FORMAT" items; expected %d.\n", s, 4);
+ g_free (current);
+ return;
+ }
+ for (i = 0; i < 4; i++)
+ calibration[i] = current[i];
+
+ if (calibration[0] == -1 &&
+ calibration[1] == -1 &&
+ calibration[2] == -1 &&
+ calibration[3] == -1) {
+ gint *device_cal;
+ device_cal = gsd_wacom_device_get_area(page->priv->stylus);
+ for (i = 0; i < 4; i++)
+ calibration[i] = device_cal[i];
+ g_free (device_cal);
+ }
+
+ if (run_calibration(calibration, 4))
+ set_calibration(calibration, 4, page->priv->wacom_settings);
+
+ g_free (current);
+}
static void
set_feel_from_gsettings (GtkAdjustment *adjustment, GSettings *settings)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]