64 lines
1.9 KiB
Diff
64 lines
1.9 KiB
Diff
From a4e9b92e2449b4c8f8654a0eaf0f1ca6627da1fc Mon Sep 17 00:00:00 2001
|
|
From: Peter Hutterer <peter.hutterer@redhat.com>
|
|
Date: Mon, 20 Oct 2008 12:19:55 +1030
|
|
Subject: [PATCH] config: don't add duplicate devices through HAL.
|
|
|
|
If HAL is restarted, the device list is send to the server again, leading
|
|
first to duplicate devices (and thus duplicate events), and later to a
|
|
FatalError "Too many input devices."
|
|
|
|
dev->config_info contains the UDI for the device. If the UDI of a new devices
|
|
is equal to one we already have in the device list, just ignore it.
|
|
---
|
|
config/hal.c | 27 +++++++++++++++++++++++++++
|
|
1 files changed, 27 insertions(+), 0 deletions(-)
|
|
|
|
diff --git a/config/hal.c b/config/hal.c
|
|
index 0e0505b..639e0ec 100644
|
|
--- a/config/hal.c
|
|
+++ b/config/hal.c
|
|
@@ -166,6 +166,26 @@ get_prop_string_array(LibHalContext *hal_ctx, const char *udi, const char *prop)
|
|
return ret;
|
|
}
|
|
|
|
+static BOOL
|
|
+device_is_duplicate(char *config_info)
|
|
+{
|
|
+ DeviceIntPtr dev;
|
|
+
|
|
+ for (dev = inputInfo.devices; dev; dev = dev->next)
|
|
+ {
|
|
+ if (dev->config_info && (strcmp(dev->config_info, config_info) == 0))
|
|
+ return TRUE;
|
|
+ }
|
|
+
|
|
+ for (dev = inputInfo.off_devices; dev; dev = dev->next)
|
|
+ {
|
|
+ if (dev->config_info && (strcmp(dev->config_info, config_info) == 0))
|
|
+ return TRUE;
|
|
+ }
|
|
+
|
|
+ return FALSE;
|
|
+}
|
|
+
|
|
static void
|
|
device_added(LibHalContext *hal_ctx, const char *udi)
|
|
{
|
|
@@ -227,6 +247,13 @@ device_added(LibHalContext *hal_ctx, const char *udi)
|
|
}
|
|
sprintf(config_info, "hal:%s", udi);
|
|
|
|
+ /* Check for duplicate devices */
|
|
+ if (device_is_duplicate(config_info))
|
|
+ {
|
|
+ LogMessage(X_WARNING, "config/hal: device %s already added. Ignoring.\n", name);
|
|
+ goto unwind;
|
|
+ }
|
|
+
|
|
/* ok, grab options from hal.. iterate through all properties
|
|
* and lets see if any of them are options that we can add */
|
|
set = libhal_device_get_all_properties(hal_ctx, udi, &error);
|
|
--
|
|
1.6.0.1
|
|
|