[gnome-settings-daemon] wacom: Remove Tablet PC setting
- From: Bastien Nocera <hadess src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-settings-daemon] wacom: Remove Tablet PC setting
- Date: Mon, 30 Sep 2013 15:38:41 +0000 (UTC)
commit 4b9ff707b4511b5857722c9ed3cf3efc385cb5cf
Author: Bastien Nocera <hadess hadess net>
Date: Mon Sep 30 08:07:49 2013 +0200
wacom: Remove Tablet PC setting
As we do not have a UI for this configuration, and that people
are used to handling it through xsetwacom, remove the setting,
and let people run xsetwacom instead of trampling over their choice.
...ings-daemon.peripherals.wacom.gschema.xml.in.in | 5 ----
plugins/wacom/gsd-wacom-manager.c | 26 --------------------
2 files changed, 0 insertions(+), 31 deletions(-)
---
diff --git a/data/org.gnome.settings-daemon.peripherals.wacom.gschema.xml.in.in
b/data/org.gnome.settings-daemon.peripherals.wacom.gschema.xml.in.in
index d642c85..5908fbc 100644
--- a/data/org.gnome.settings-daemon.peripherals.wacom.gschema.xml.in.in
+++ b/data/org.gnome.settings-daemon.peripherals.wacom.gschema.xml.in.in
@@ -41,11 +41,6 @@
<_summary>Wacom touch feature</_summary>
<_description>Enable this to move the cursor when the user touches the tablet.</_description>
</key>
- <key name="tablet-pc-button" type="b">
- <default>false</default>
- <_summary>Wacom tablet PC feature</_summary>
- <_description>Enable this to only report stylus events when the tip is pressed.</_description>
- </key>
<key name="last-calibrated-resolution" type="(ii)">
<default>(-1, -1)</default>
<_summary>Wacom last calibrated resolution</_summary>
diff --git a/plugins/wacom/gsd-wacom-manager.c b/plugins/wacom/gsd-wacom-manager.c
index 45b3a8f..8bc2a09 100644
--- a/plugins/wacom/gsd-wacom-manager.c
+++ b/plugins/wacom/gsd-wacom-manager.c
@@ -57,7 +57,6 @@
#define KEY_ROTATION "rotation"
#define KEY_TOUCH "touch"
-#define KEY_TPCBUTTON "tablet-pc-button"
#define KEY_IS_ABSOLUTE "is-absolute"
#define KEY_AREA "area"
#define KEY_DISPLAY "display"
@@ -576,26 +575,6 @@ set_touch (GsdWacomDevice *device,
}
static void
-set_tpcbutton (GsdWacomDevice *device,
- gboolean tpcbutton)
-{
- /* Wacom's TPCButton option which this setting emulates is to enable
- * Tablet PC stylus behaviour when on. The property "Hover Click"
- * works the other way round, i.e. if Hover Click is enabled this
- * is the equivalent of TPC behaviour disabled. */
- gchar data = tpcbutton ? 0 : 1;
- PropertyHelper property = {
- .name = "Wacom Hover Click",
- .nitems = 1,
- .format = 8,
- .type = XA_INTEGER,
- .data.c = &data,
- };
-
- wacom_set_property (device, &property);
-}
-
-static void
set_pressurethreshold (GsdWacomDevice *device,
gint threshold)
{
@@ -874,9 +853,6 @@ set_wacom_settings (GsdWacomManager *manager,
return;
}
- if (type == WACOM_TYPE_STYLUS)
- set_tpcbutton (device, g_settings_get_boolean (settings, KEY_TPCBUTTON));
-
set_absolute (device, g_settings_get_boolean (settings, KEY_IS_ABSOLUTE));
/* Ignore touch devices as they do not share the same range of values for area */
@@ -909,8 +885,6 @@ wacom_settings_changed (GSettings *settings,
} else if (g_str_equal (key, KEY_TOUCH)) {
if (type == WACOM_TYPE_TOUCH)
set_touch (device, g_settings_get_boolean (settings, key));
- } else if (g_str_equal (key, KEY_TPCBUTTON)) {
- set_tpcbutton (device, g_settings_get_boolean (settings, key));
} else if (g_str_equal (key, KEY_IS_ABSOLUTE)) {
if (type != WACOM_TYPE_CURSOR &&
type != WACOM_TYPE_PAD &&
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]