git.iko.soy/unity8
on xenial help sign in
Merge remote-tracking branch 'origin/xenial_-_edge_-_wayland' into xenial_-_qt-5-12_-_wayland
9beb6b6Marius Gripsgard
plugins/Unity/Indicators/indicatorsmanager.cpp+4−2
compare with xenial
unifiedsplit
@@ -286,8 +286,10 @@ Indicator::Ptr IndicatorsManager::indicator(const QString& indicator_name)
286 // 2) enable keyboard indicator
286 // 2) enable keyboard indicator
287 //
287 //
288 // The rest of the indicators respect their default profile (which is "phone", even on desktop PCs)
288 // The rest of the indicators respect their default profile (which is "phone", even on desktop PCs)
289− if ((new_indicator->identifier() == QStringLiteral("indicator-session"))
289+ if (new_indicator->identifier() == QStringLiteral("indicator-session") ||
290+ new_indicator->identifier() == QStringLiteral("indicator-keyboard") ||
291+ new_indicator->identifier() == QStringLiteral("ayatana-indicator-session") ||
290− || new_indicator->identifier() == QStringLiteral("indicator-keyboard")) {
292+ new_indicator->identifier() == QStringLiteral("ayatana-indicator-keyboard")) {
291 new_indicator->setProfile(QString(m_profile).replace(QStringLiteral("phone"), QStringLiteral("desktop")));
293 new_indicator->setProfile(QString(m_profile).replace(QStringLiteral("phone"), QStringLiteral("desktop")));
292 } else {
294 } else {
293 new_indicator->setProfile(m_profile);
295 new_indicator->setProfile(m_profile);