← Back to branch summary

~josharenson/unity8/fix-greeter-password-focus

« back to all changes in this revision

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

  • Committer: Josh Arenson
  • Date: 2016-03-25 19:54:02 UTC
  • mfrom: (1979.1.9 session-chooser-gui)
  • Revision ID: joshua.arenson@canonical.com-20160325195402-867v3w2zvmjj0kq3
merge prereq

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugins/Unity/Indicators/indicatorsmanager.cpp
1
1
/*
2
 
 * Copyright (C) 2013 Canonical, Ltd.
 
2
 * Copyright (C) 2013-2016 Canonical, Ltd.
3
3
 *
4
4
 * This program is free software; you can redistribute it and/or modify
5
5
 * it under the terms of the GNU General Public License as published by
12
12
 *
13
13
 * You should have received a copy of the GNU General Public License
14
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
15
 
 *
16
 
 * Author: Nick Dedekind <nick.dedekind@canonical.com>
17
15
 */
18
16
 
19
17
#include "indicatorsmanager.h"
286
284
    new_indicator->init(data->m_fileInfo.fileName(), settings);
287
285
 
288
286
    // convergence:
289
 
    // 1) enable session indicator conditionally, typically when running in a multisession/multiuser environment
 
287
    // 1) enable session indicator
290
288
    // 2) on a PC, switch the battery/power indicator to desktop mode,
291
289
    //    can't control brightness for now and phone-on-desktop broken (FIXME)
292
290
    //
293
291
    // The rest of the indicators respect their default profile (which is "phone", even on desktop PCs)
294
 
    if ((new_indicator->identifier() == QStringLiteral("indicator-session") && m_platform.isMultiSession())
 
292
    if ((new_indicator->identifier() == QStringLiteral("indicator-session"))
295
293
            || (new_indicator->identifier() == QStringLiteral("indicator-power") && m_platform.isPC())) {
296
294
        new_indicator->setProfile(QStringLiteral("desktop"));
297
295
    } else {