From 283dff91742c3478b733c1d3fd72757406f4adb8 Mon Sep 17 00:00:00 2001
From: Andrey Butirsky <butirsky@gmail.com>
Date: Sat, 21 Nov 2020 23:54:49 +0300
Subject: [PATCH] fix: [2/2] Keyboard Layout applet: layout Name doesn't fit if
 variant is set

Variants are now stored separate from layouts in their own config entry.

P-D commit:
fix: [1/2] Keyboard Layout applet: layout Name doesn't fit if variant is set
---
 xkb.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/xkb.cpp b/xkb.cpp
index 2910535774..c958d77114 100644
--- a/xkb.cpp
+++ b/xkb.cpp
@@ -175,13 +175,14 @@ xkb_keymap *Xkb::loadKeymapFromConfig()
     const KConfigGroup config = m_config->group("Layout");
     const QByteArray model = config.readEntry("Model", "pc104").toLocal8Bit();
     const QByteArray layout = config.readEntry("LayoutList", "").toLocal8Bit();
+    const QByteArray variant = config.readEntry("VariantList").toLatin1();
     const QByteArray options = config.readEntry("Options", "").toLocal8Bit();
 
     xkb_rule_names ruleNames = {
         .rules = nullptr,
         .model = model.constData(),
         .layout = layout.constData(),
-        .variant = nullptr,
+        .variant = variant.constData(),
         .options = options.constData()
     };
     applyEnvironmentRules(ruleNames);