diff options
| author | Matthew Garrett <mjg59@srcf.ucam.org> | 2009-02-26 09:04:38 +0100 |
|---|---|---|
| committer | Martin Pitt <martin.pitt@ubuntu.com> | 2009-02-26 09:04:38 +0100 |
| commit | ff8ca64b6f5ceadf01296f52491892fb16f962c6 (patch) | |
| tree | ca48508721c3e9a171760d54726b9d66dd214994 | |
| parent | e3b9bf69e14ec6172e48642298619ae74c18c58f (diff) | |
don't add input capabilities to tablet PNP device
If hal detects that a PNP device is associated with a tablet PC it
adds the input capability to that device. This is wrong - the input
device is the serial device whose parent is this PNP device. Adding
the input capability just results in X attempting to add the PNP
device as an input device, despite it not being one and having no
associated driver.
FDI files for the appropriate driver can add the capabilities to the
serial port device, so there's no need to have the core add these
misleading ones. Simply remove them.
| -rw-r--r-- | hald/linux/device.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/hald/linux/device.c b/hald/linux/device.c index e3108e9e..66537823 100644 --- a/hald/linux/device.c +++ b/hald/linux/device.c @@ -2127,10 +2127,6 @@ pnp_add (const gchar *sysfs_path, const gchar *device_file, HalDevice *parent_de if( !strncmp(pnp_id, "WACf00", 6) || !strcmp(pnp_id, "FUJ02e5") || !strcmp(pnp_id, "FUJ02e6") || !strcmp(pnp_id, "FPI2004")) { /* a internal serial tablet --> this should be a tablet pc */ - hal_device_add_capability (d, "input"); - hal_device_add_capability (d, "input.tablet"); - hal_device_add_capability (d, "input.tablet.tabletPC"); - if ((computer = hal_device_store_find (hald_get_gdl (), "/org/freedesktop/Hal/devices/computer")) != NULL || (computer = hal_device_store_find (hald_get_tdl (), "/org/freedesktop/Hal/devices/computer")) != NULL) { |