summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Zeuthen <davidz@redhat.com>2007-04-12 15:46:26 -0400
committerDavid Zeuthen <davidz@redhat.com>2007-04-12 15:46:26 -0400
commitf22a37b7a7073b3398e9060e21bc1d12dc58783f (patch)
treec30471e3169c4ce788472231d8f39b657a865c66
parent485f9aa6780690d915a13d813bc753501a3c899e (diff)
only start one hald-addon-keyboard addon
this patch fixes the problem that one device can have get started the same hald-addon-keyboard addon multiple times. This work only together with my patch for the contains_not FDI-file directive. (similar to commit 5745da44f3bb43dafd9b53cbfcfc1218619a5263 on master)
-rw-r--r--fdi/policy/10osvendor/10-keyboard-policy.fdi8
1 files changed, 6 insertions, 2 deletions
diff --git a/fdi/policy/10osvendor/10-keyboard-policy.fdi b/fdi/policy/10osvendor/10-keyboard-policy.fdi
index 95993842..d1885c55 100644
--- a/fdi/policy/10osvendor/10-keyboard-policy.fdi
+++ b/fdi/policy/10osvendor/10-keyboard-policy.fdi
@@ -5,10 +5,14 @@
<device>
<match key="info.capabilities" contains="input">
<match key="info.capabilities" contains="button">
- <append key="info.addons" type="strlist">hald-addon-keyboard</append>
+ <match key="info.addons" contains_not="hald-addon-keyboard">
+ <append key="info.addons" type="strlist">hald-addon-keyboard</append>
+ </match>
</match>
<match key="info.capabilities" contains="input.keyboard">
- <append key="info.addons" type="strlist">hald-addon-keyboard</append>
+ <match key="info.addons" contains_not="hald-addon-keyboard">
+ <append key="info.addons" type="strlist">hald-addon-keyboard</append>
+ </match>
<match key="info.capabilities" contains_not="button">
<append key="info.capabilities" type="strlist">button</append>
</match>