diff options
| author | Thomas Hindoe Paaboel Andersen <phomes@gmail.com> | 2015-04-30 20:10:31 +0200 |
|---|---|---|
| committer | Thomas Hindoe Paaboel Andersen <phomes@gmail.com> | 2015-04-30 20:12:48 +0200 |
| commit | 470d7e17f986c1eeb1c98d18150c25e1b7375fb3 (patch) | |
| tree | 7ad5c94a4922168db1089cdd41a398437029d803 /src/libsystemd-terminal/idev-keyboard.c | |
| parent | e7e90a8eee056fd12c8ad83470143f7798240dbc (diff) | |
terminal: update for simpler sd-bus api's
Diffstat (limited to 'src/libsystemd-terminal/idev-keyboard.c')
| -rw-r--r-- | src/libsystemd-terminal/idev-keyboard.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/libsystemd-terminal/idev-keyboard.c b/src/libsystemd-terminal/idev-keyboard.c index b5eb7371ab..ef56ee2482 100644 --- a/src/libsystemd-terminal/idev-keyboard.c +++ b/src/libsystemd-terminal/idev-keyboard.c @@ -387,8 +387,7 @@ static const struct bus_properties_map kbdctx_locale_map[] = { { }, }; -static int kbdctx_locale_get_all_fn(sd_bus *bus, - sd_bus_message *m, +static int kbdctx_locale_get_all_fn(sd_bus_message *m, void *userdata, sd_bus_error *ret_err) { kbdctx *kc = userdata; @@ -404,7 +403,7 @@ static int kbdctx_locale_get_all_fn(sd_bus *bus, return 0; } - r = bus_message_map_all_properties(bus, m, kbdctx_locale_map, kc); + r = bus_message_map_all_properties(m, kbdctx_locale_map, kc); if (r < 0) { log_debug("idev-keyboard: erroneous GetAll() reply from locale1"); return 0; @@ -448,8 +447,7 @@ error: return log_debug_errno(r, "idev-keyboard: cannot send GetAll to locale1: %m"); } -static int kbdctx_locale_props_changed_fn(sd_bus *bus, - sd_bus_message *signal, +static int kbdctx_locale_props_changed_fn(sd_bus_message *signal, void *userdata, sd_bus_error *ret_err) { kbdctx *kc = userdata; |