git.iko.soy/unity8
on xenial help sign in
reinstate the keyboard-indicator filtering
855329dLukáš Tinkl
plugins/Unity/Indicators/indicatorsmanager.cpp+4
compare with xenial
unifiedsplit
@@ -116,6 +116,10 @@ void IndicatorsManager::loadFile(const QFileInfo& file_info)
116 QSettings indicator_settings(file_info.absoluteFilePath(), QSettings::IniFormat, this);
116 QSettings indicator_settings(file_info.absoluteFilePath(), QSettings::IniFormat, this);
117 const QString name = indicator_settings.value(QStringLiteral("Indicator Service/Name")).toString();
117 const QString name = indicator_settings.value(QStringLiteral("Indicator Service/Name")).toString();
118
118
119+ if (m_platform.isPC() && name == "indicator-keyboard") {
120+ return; // convergence: skip this indicator until it works in Mir
121+ }
122+
119 auto iter = m_indicatorsData.constFind(name);
123 auto iter = m_indicatorsData.constFind(name);
120 if (iter != m_indicatorsData.constEnd())
124 if (iter != m_indicatorsData.constEnd())
121 {
125 {