X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Flibsystemd-terminal%2Fidev-keyboard.c;fp=src%2Flibsystemd-terminal%2Fidev-keyboard.c;h=ab9e4811b3bb88837836968f12443c09732d034f;hb=427c71629ea375e4ca1841a55902b40de21f2ab4;hp=03f54bb74f32c6ad94432c2a19666157dfd47e2b;hpb=c168eb6785bacc2042687bf879259dfc27d5a523;p=elogind.git diff --git a/src/libsystemd-terminal/idev-keyboard.c b/src/libsystemd-terminal/idev-keyboard.c index 03f54bb74..ab9e4811b 100644 --- a/src/libsystemd-terminal/idev-keyboard.c +++ b/src/libsystemd-terminal/idev-keyboard.c @@ -317,11 +317,14 @@ static int kbdctx_locale_props_changed_fn(sd_bus *bus, kc->slot_locale_get_all = sd_bus_slot_unref(kc->slot_locale_get_all); + /* skip interface name */ + r = sd_bus_message_skip(signal, "s"); + if (r < 0) + goto error; + r = bus_message_map_properties_changed(bus, signal, kbdctx_locale_map, kc); - if (r < 0) { - log_debug("idev-keyboard: cannot handle PropertiesChanged from locale1: %s", strerror(-r)); - return r; - } + if (r < 0) + goto error; if (r > 0) { r = kbdctx_query_locale(kc); @@ -331,6 +334,10 @@ static int kbdctx_locale_props_changed_fn(sd_bus *bus, kbdctx_refresh_keymap(kc); return 0; + +error: + log_debug("idev-keyboard: cannot handle PropertiesChanged from locale1: %s", strerror(-r)); + return r; } static int kbdctx_setup_bus(kbdctx *kc) {