[gnome-settings-daemon] wacom: Fix crash handling getting default area
- From: Bastien Nocera <hadess src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-settings-daemon] wacom: Fix crash handling getting default area
- Date: Tue, 8 Oct 2013 16:31:46 +0000 (UTC)
commit 8a1671bf0a154a57b487b537bbdd8c9350109ce6
Author: Bastien Nocera <hadess hadess net>
Date: Tue Oct 8 18:30:25 2013 +0200
wacom: Fix crash handling getting default area
C, how I love thee.
plugins/wacom/gsd-wacom-device.c | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
---
diff --git a/plugins/wacom/gsd-wacom-device.c b/plugins/wacom/gsd-wacom-device.c
index fb1b176..73b0ee5 100644
--- a/plugins/wacom/gsd-wacom-device.c
+++ b/plugins/wacom/gsd-wacom-device.c
@@ -1904,8 +1904,8 @@ gsd_wacom_device_get_area (GsdWacomDevice *device)
}
static gboolean
-fill_old_axis (int device_id,
- gint **items)
+fill_old_axis (int device_id,
+ gint *items)
{
int ndevices, i;
XDeviceInfoPtr list, slist;
@@ -1930,10 +1930,10 @@ fill_old_axis (int device_id,
XAxisInfoPtr ax = (XAxisInfoPtr) V->axes;
if (V->num_axes >= 2) {
- *items[0] = ax[0].min_value;
- *items[1] = ax[0].max_value;
- *items[2] = ax[1].min_value;
- *items[3] = ax[1].max_value;
+ items[0] = ax[0].min_value;
+ items[1] = ax[0].max_value;
+ items[2] = ax[1].min_value;
+ items[3] = ax[1].max_value;
g_debug ("Found factory values for device calibration");
retval = TRUE;
break;
@@ -1965,7 +1965,7 @@ gsd_wacom_device_get_default_area (GsdWacomDevice *device)
g_object_get (device->priv->gdk_device, "device-id", &id, NULL);
device_area = g_new0 (int, 4);
- ret = fill_old_axis (id, &device_area);
+ ret = fill_old_axis (id, device_area);
if (!ret) {
g_free (device_area);
return NULL;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]