git.iko.soy/unity8
on xenial help sign in
also hide the duplicate Reboot entry
44d21d7Lukáš Tinkl
plugins/Unity/Indicators/indicatorsmanager.cpp+1−3
compare with xenial
unifiedsplit
@@ -1,5 +1,5 @@
1/*
1/*
2− * Copyright (C) 2013 Canonical, Ltd.
2+ * Copyright (C) 2013-2016 Canonical, Ltd.
3 *
3 *
4 * This program is free software; you can redistribute it and/or modify
4 * This program is free software; you can redistribute it and/or modify
5 * it under the terms of the GNU General Public License as published by
5 * it under the terms of the GNU General Public License as published by
@@ -12,8 +12,6 @@
12 *
12 *
13 * You should have received a copy of the GNU General Public License
13 * You should have received a copy of the GNU General Public License
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
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#include "indicatorsmanager.h"
17#include "indicatorsmanager.h"
qml/Panel/Indicators/MenuItemFactory.qml+2−1
@@ -983,7 +983,8 @@ Item {
983 function load(modelData, context) {
983 function load(modelData, context) {
984 // tweak indicator-session items
984 // tweak indicator-session items
985 if (context === "indicator-session") {
985 if (context === "indicator-session") {
986− if ((modelData.action === "indicator.logout" || modelData.action === "indicator.suspend" || modelData.action === "indicator.hibernate")
986+ if ((modelData.action === "indicator.logout" || modelData.action === "indicator.suspend" || modelData.action === "indicator.hibernate" ||
987+ modelData.action === "indicator.reboot")
987 && !Platform.isPC) {
988 && !Platform.isPC) {
988 return null; // logout, suspend and hibernate hidden on devices
989 return null; // logout, suspend and hibernate hidden on devices
989 }
990 }