← Back to branch summary

~mzanetti/unity8/fix-1648251

« back to all changes in this revision

Viewing changes to plugins/Unity/Indicators/indicatorsmanager.cpp

  • Committer: Michael Zanetti
  • Date: 2016-12-01 12:21:15 UTC
  • mfrom: (2525.1.201 unity8)
  • Revision ID: michael.zanetti@canonical.com-20161201122115-k6ycl80o95t7rddc
merge trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugins/Unity/Indicators/indicatorsmanager.cpp
282
282
    // convergence:
283
283
    // 1) enable session indicator
284
284
    // 2) enable keyboard indicator
285
 
    // 3) on a PC, switch the battery/power indicator to desktop mode,
286
 
    //    can't control brightness for now and phone-on-desktop broken (FIXME)
287
285
    //
288
286
    // The rest of the indicators respect their default profile (which is "phone", even on desktop PCs)
289
287
    if ((new_indicator->identifier() == QStringLiteral("indicator-session"))
290
 
            || new_indicator->identifier() == QStringLiteral("indicator-keyboard")
291
 
            || (new_indicator->identifier() == QStringLiteral("indicator-power") && m_platform.isPC())) {
 
288
            || new_indicator->identifier() == QStringLiteral("indicator-keyboard")) {
292
289
        new_indicator->setProfile(QString(m_profile).replace(QStringLiteral("phone"), QStringLiteral("desktop")));
293
290
    } else {
294
291
        new_indicator->setProfile(m_profile);