[gnome-settings-daemon] wacom: Don't add fallback styli ourselves
- From: Bastien Nocera <hadess src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-settings-daemon] wacom: Don't add fallback styli ourselves
- Date: Fri, 18 May 2012 09:25:19 +0000 (UTC)
commit 62f51ac11a4ec764b6029cb81c7f82a007845368
Author: Bastien Nocera <hadess hadess net>
Date: Fri May 18 10:23:39 2012 +0100
wacom: Don't add fallback styli ourselves
The libwacom code should do that for us.
https://bugzilla.gnome.org/show_bug.cgi?id=672917
plugins/wacom/gsd-wacom-device.c | 7 +------
1 files changed, 1 insertions(+), 6 deletions(-)
---
diff --git a/plugins/wacom/gsd-wacom-device.c b/plugins/wacom/gsd-wacom-device.c
index d334863..714511b 100644
--- a/plugins/wacom/gsd-wacom-device.c
+++ b/plugins/wacom/gsd-wacom-device.c
@@ -1133,14 +1133,9 @@ gsd_wacom_device_update_from_db (GsdWacomDevice *device,
guint i;
ids = libwacom_get_supported_styli(wacom_device, &num_styli);
+ g_assert (num_styli >= 1);
for (i = 0; i < num_styli; i++)
add_stylus_to_device (device, settings_path, ids[i]);
- /* Create a fallback stylus if we don't have one */
- if (num_styli == 0)
- add_stylus_to_device (device, settings_path,
- device->priv->type == WACOM_TYPE_STYLUS ?
- WACOM_STYLUS_FALLBACK_ID : WACOM_ERASER_FALLBACK_ID);
-
device->priv->styli = g_list_reverse (device->priv->styli);
}
g_free (settings_path);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]