diff --git a/logoutdialog-honor-Offer-shutdown-options.patch b/logoutdialog-honor-Offer-shutdown-options.patch new file mode 100644 index 0000000..98e3aa6 --- /dev/null +++ b/logoutdialog-honor-Offer-shutdown-options.patch @@ -0,0 +1,37 @@ +From 913142c565ec7cb51f9d5406193d3c9a2562dbb0 Mon Sep 17 00:00:00 2001 +From: Kai Uwe Broulik +Date: Sat, 8 Jul 2017 16:29:01 +0200 +Subject: [Logout Dialog] Honor "Offer shutdown options" + +"maysd" stands for "may shut down" apparently. +Kickoff already removed the options in this case but clicking "Logout" yields the new dialog +which offers them all again. + +Differential Revision: https://phabricator.kde.org/D6574 +--- + lookandfeel/contents/logout/Logout.qml | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/lookandfeel/contents/logout/Logout.qml b/lookandfeel/contents/logout/Logout.qml +index 460b802..251e1ee 100644 +--- a/lookandfeel/contents/logout/Logout.qml ++++ b/lookandfeel/contents/logout/Logout.qml +@@ -168,6 +168,7 @@ PlasmaCore.ColorScope { + KeyNavigation.left: suspendButton + KeyNavigation.right: shutdownButton + focus: sdtype == ShutdownType.ShutdownTypeReboot ++ visible: maysd + } + LogoutButton { + id: shutdownButton +@@ -177,6 +178,7 @@ PlasmaCore.ColorScope { + KeyNavigation.left: rebootButton + KeyNavigation.right: logoutButton + focus: sdtype == ShutdownType.ShutdownTypeHalt ++ visible: maysd + } + LogoutButton { + id: logoutButton +-- +cgit v0.11.2 + diff --git a/plasma5-workspace.changes b/plasma5-workspace.changes index 213d6b8..fd98282 100644 --- a/plasma5-workspace.changes +++ b/plasma5-workspace.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Sun Jul 9 09:51:05 UTC 2017 - wbauer@tmo.at + +- Add logoutdialog-honor-Offer-shutdown-options.patch to make the + logout dialog respect the "Offer shutdown options" setting and + hide "Reboot" and "Shutdown" if disabled (boo#1008844) + ------------------------------------------------------------------- Sat Jul 1 10:48:32 UTC 2017 - wbauer@tmo.at diff --git a/plasma5-workspace.spec b/plasma5-workspace.spec index 1daddf7..f7f3737 100644 --- a/plasma5-workspace.spec +++ b/plasma5-workspace.spec @@ -39,6 +39,7 @@ Patch1: 0001-Ignore-default-sddm-face-icons.patch # PATCHES 100-200 and above are from upstream 5.10 branch # PATCHES 201-300 and above are from upstream master/5.11 branch Patch201: applauncher-allow-to-show-apps-by-name.patch +Patch202: logoutdialog-honor-Offer-shutdown-options.patch BuildRequires: breeze5-icons BuildRequires: fdupes BuildRequires: kf5-filesystem @@ -211,6 +212,7 @@ workspace. Development files. %patch0 -p1 %patch1 -p1 %patch201 -p1 +%patch202 -p1 %build %cmake_kf5 -d build -- -DKDE4_COMMON_PAM_SERVICE=xdm -DKDE_DEFAULT_HOME=.kde4 -DCMAKE_INSTALL_LOCALEDIR=%{_kf5_localedir}