View | Details | Raw Unified | Return to bug 235009 | Differences between
and this patch

Collapse All | Expand All

(-)/var/ports/work/usr/ports/x11/gnome-shell/work/gnome-shell-3.28.3/js/ui/status/keyboard.js (+14 lines)
Lines 245-250 Link Here
245
                id += '+' + variants[i];
245
                id += '+' + variants[i];
246
            sourcesList.push({ type: INPUT_SOURCE_TYPE_XKB, id: id });
246
            sourcesList.push({ type: INPUT_SOURCE_TYPE_XKB, id: id });
247
        }
247
        }
248
249
        // FreeBSD: systemd-localed is absent, so the above sourcesList,
250
        // which would otherwise come from org.freedesktop.locale1, is
251
        // empty. As a fallback, retrieve the input source from the
252
        // current locale.
253
254
        let _keyboardManagerLayout = KeyboardManager.getKeyboardManager()._getLocaleLayout();
255
        if (_keyboardManagerLayout) {
256
            let _kMLid = _keyboardManagerLayout.layout;
257
            if (!!_keyboardManagerLayout.variant)
258
                _kMLid = _kMLid + '+' + _keyboardManagerLayout.variant;
259
            sourcesList.push({ type: INPUT_SOURCE_TYPE_XKB, id: _kMLid });
260
        }
261
248
        return sourcesList;
262
        return sourcesList;
249
    },
263
    },
250
264

Return to bug 235009