diff options
| author | Daniel Stone <daniel@fooishbar.org> | 2007-08-07 16:37:42 +0300 |
|---|---|---|
| committer | Daniel Stone <daniel@fooishbar.org> | 2007-08-08 01:34:59 +0300 |
| commit | aef255425a3521d66c3405d34f7787628a22703e (patch) | |
| tree | 4b7eb935b984da1b74786661d44a263d47ec045f | |
| parent | 838e59c02ec06446fc180fb9d86fa8793c7b9903 (diff) | |
Config: HAL: Use input.xkb namespace
Use an explicit input.xkb.foo namespace, not input.xkb_foo.
| -rw-r--r-- | config/hal.c | 10 | ||||
| -rw-r--r-- | config/x11-input.fdi | 10 |
2 files changed, 10 insertions, 10 deletions
diff --git a/config/hal.c b/config/hal.c index f29ba9213..833ec59a0 100644 --- a/config/hal.c +++ b/config/hal.c @@ -198,12 +198,12 @@ device_added(LibHalContext *hal_ctx, const char *udi) name = xstrdup("(unnamed)"); if (type & TYPE_KEYS) { - xkb_rules = get_prop_string(hal_ctx, udi, "input.xkb_rules", &error); - xkb_model = get_prop_string(hal_ctx, udi, "input.xkb_model", &error); - xkb_layout = get_prop_string(hal_ctx, udi, "input.xkb_layout", &error); - xkb_variant = get_prop_string(hal_ctx, udi, "input.xkb_variant", + xkb_rules = get_prop_string(hal_ctx, udi, "input.xkb.rules", &error); + xkb_model = get_prop_string(hal_ctx, udi, "input.xkb.model", &error); + xkb_layout = get_prop_string(hal_ctx, udi, "input.xkb.layout", &error); + xkb_variant = get_prop_string(hal_ctx, udi, "input.xkb.variant", &error); - xkb_options = get_prop_string_array(hal_ctx, udi, "input.xkb_options", + xkb_options = get_prop_string_array(hal_ctx, udi, "input.xkb.options", &error); } diff --git a/config/x11-input.fdi b/config/x11-input.fdi index c0e636f93..7f516ca7a 100644 --- a/config/x11-input.fdi +++ b/config/x11-input.fdi @@ -11,21 +11,21 @@ </match> <match key="info.capabilities" contains="input.keys"> - <merge key="input.xkb_rules" type="string">base</merge> + <merge key="input.xkb.rules" type="string">base</merge> <!-- If we're using Linux, we use evdev by default (falling back to keyboard otherwise). --> <merge key="input.x11_driver" type="string">keyboard</merge> - <merge key="input.xkb_model" type="string">keyboard</merge> + <merge key="input.xkb.model" type="string">keyboard</merge> <match key="/org/freedesktop/Hal/devices/computer:system.kernel.name" string="Linux"> <merge key="input.x11_driver" type="string">evdev</merge> - <merge key="input.xkb_model" type="string">evdev</merge> + <merge key="input.xkb.model" type="string">evdev</merge> </match> - <merge key="input.xkb_layout" type="string">us</merge> + <merge key="input.xkb.layout" type="string">us</merge> - <merge key="input.xkb_variant" type="string" /> + <merge key="input.xkb.variant" type="string" /> </match> </device> </deviceinfo> |