git.iko.soy/unity8
on xenial help sign in
save the keymaps correctly, fix includes, add a warning when keymaps empty
commit60ac115a3b151f89dfd3a2b585ce51c89d427cc9 authorLukáš Tinkl <lukas.tinkl@canonical.com> dateTue 2 Aug 2016, 15:00 (10 years ago) parentf7e177b
2 files changed+4−3
compare with xenial
unifiedsplit
plugins/AccountsService/AccountsService.cpp+3−2 plugins/Wizard/CMakeLists.txt+1−1
plugins/AccountsService/AccountsService.cpp+3−2
@@ -287,16 +287,17 @@ QStringList AccountsService::keymaps() const
287287void AccountsService::setKeymaps(const QStringList &keymaps)
288288{
289289 if (keymaps.isEmpty()) {
290+ qWarning() << "Setting empty keymaps is not supported";
290291 return;
291292 }
292293
293− StringMap map;
294294 StringMapList result;
295295 Q_FOREACH(const QString &keymap, keymaps) {
296+ StringMap map;
296297 map.insert(QStringLiteral("xkb"), keymap);
298+ result.append(map);
297299 }
298300
299− result.append(map);
300301 setProperty(IFACE_ACCOUNTS_USER, PROP_INPUT_SOURCES, QVariant::fromValue(result));
301302 Q_EMIT keymapsChanged();
302303}
plugins/Wizard/CMakeLists.txt+1−1
@@ -1,6 +1,6 @@
11pkg_search_module(GD3 REQUIRED gnome-desktop-3.0)
22
3−include_directories(${GD3_INCLUDE_DIRS} ${GLIB_INCLUDE_DIRS} ${GEONAMES_INCLUDE_DIRS})
3+include_directories(SYSTEM ${GD3_INCLUDE_DIRS} ${GLIB_INCLUDE_DIRS} ${GEONAMES_INCLUDE_DIRS})
44
55add_library(Wizard-qml MODULE
66 plugin.cpp