@@ -114,10 +114,6 @@ void IndicatorsManager::loadFile(const QFileInfo& file_info)
114 QSettings indicator_settings(file_info.absoluteFilePath(), QSettings::IniFormat, this);
114 QSettings indicator_settings(file_info.absoluteFilePath(), QSettings::IniFormat, this);
115 const QString name = indicator_settings.value(QStringLiteral("Indicator Service/Name")).toString();
115 const QString name = indicator_settings.value(QStringLiteral("Indicator Service/Name")).toString();
117− if (m_platform.isPC() && name == QLatin1String("indicator-keyboard")) {
118− return; // convergence: skip this indicator until it works in Mir
121 auto iter = m_indicatorsData.constFind(name);
117 auto iter = m_indicatorsData.constFind(name);
122 if (iter != m_indicatorsData.constEnd())
118 if (iter != m_indicatorsData.constEnd())
@@ -289,8 +285,9 @@ Indicator::Ptr IndicatorsManager::indicator(const QString& indicator_name)
289 // can't control brightness for now and phone-on-desktop broken (FIXME)
285 // can't control brightness for now and phone-on-desktop broken (FIXME)
291 // The rest of the indicators respect their default profile (which is "phone", even on desktop PCs)
287 // The rest of the indicators respect their default profile (which is "phone", even on desktop PCs)
292− if ((new_indicator->identifier() == QStringLiteral("indicator-session"))
288+ if ((new_indicator->identifier() == QStringLiteral("indicator-session")
289+ || new_indicator->identifier() == QStringLiteral("indicator-keyboard")
293− || (new_indicator->identifier() == QStringLiteral("indicator-power") && m_platform.isPC())) {
290+ || (new_indicator->identifier() == QStringLiteral("indicator-power") && m_platform.isPC()))) {
294 new_indicator->setProfile(QStringLiteral("desktop"));
291 new_indicator->setProfile(QStringLiteral("desktop"));
296 new_indicator->setProfile(m_profile);
293 new_indicator->setProfile(m_profile);