git.iko.soy/unity8
on xenial help sign in
also hide the duplicate Reboot entry
commit44d21d705612fe8eb5ac0d38bf38106a3af44d96 authorLukáš Tinkl <lukas.tinkl@canonical.com> dateWed 9 Mar 2016, 12:51 (11 years ago) parentfe6c2af
2 files changed+3−4
compare with xenial
unifiedsplit
plugins/Unity/Indicators/indicatorsmanager.cpp+1−3 qml/Panel/Indicators/MenuItemFactory.qml+2−1
plugins/Unity/Indicators/indicatorsmanager.cpp+1−3
@@ -1,5 +1,5 @@
11/*
2− * Copyright (C) 2013 Canonical, Ltd.
2+ * Copyright (C) 2013-2016 Canonical, Ltd.
33 *
44 * This program is free software; you can redistribute it and/or modify
55 * it under the terms of the GNU General Public License as published by
@@ -12,8 +12,6 @@
1212 *
1313 * You should have received a copy of the GNU General Public License
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15− *
16− * Author: Nick Dedekind <nick.dedekind@canonical.com>
1715 */
1816
1917#include "indicatorsmanager.h"
qml/Panel/Indicators/MenuItemFactory.qml+2−1
@@ -983,7 +983,8 @@ Item {
983983 function load(modelData, context) {
984984 // tweak indicator-session items
985985 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")
987988 && !Platform.isPC) {
988989 return null; // logout, suspend and hibernate hidden on devices
989990 }