[kde-workspace] Resolves #851887 - KDE Logout does not Suspend to RAM/Disk

[Lukas Tinkl]

commit 2795beb22f110476b4b25d9e3ed6cbe993a31b58
Author: Lukas Tinkl <lukas at kde.org>
Date:   Mon Aug 27 17:12:26 2012 +0200

    Resolves #851887 - KDE Logout does not Suspend to RAM/Disk
    
    - Add apper to default kickoff favorites (#850445)

 kde-workspace-4.9.1-qmlshutdownoptions.patch |   32 ++++++++++++++++++++++++++
 kde-workspace.spec                           |    7 +++++-
 2 files changed, 38 insertions(+), 1 deletions(-)
---
diff --git a/kde-workspace-4.9.1-qmlshutdownoptions.patch b/kde-workspace-4.9.1-qmlshutdownoptions.patch
new file mode 100644
index 0000000..71ff4ca
--- /dev/null
+++ b/kde-workspace-4.9.1-qmlshutdownoptions.patch
@@ -0,0 +1,32 @@
+commit 2519ac36f9218eb267e76d345172dc300c16b019
+Author: Lamarque V. Souza <lamarque at kde.org>
+Date:   Fri Aug 17 10:09:37 2012 -0300
+
+    Fix menu items not clickable problem in QML shutdown dialog.
+    
+    BUG: 304907
+    FIXED-IN: 4.9.1
+
+diff --git a/ksmserver/themes/default/main.qml b/ksmserver/themes/default/main.qml
+index 24dcb59..47128af 100644
+--- a/ksmserver/themes/default/main.qml
++++ b/ksmserver/themes/default/main.qml
+@@ -278,15 +278,15 @@ PlasmaCore.FrameSvgItem {
+                             contextMenu = shutdownOptionsComponent.createObject(shutdownButton)
+                             if (spdMethods.StandbyState) {
+                                 // 1 == Solid::PowerManagement::StandbyState
+-                                contextMenu.append({itemIndex: 1, itemText: i18n("&Standby")})
++                                contextMenu.append({itemIndex: 1, itemText: i18n("&Standby"), itemSubMenu: null, itemAllowAmpersand: false})
+                             }
+                             if (spdMethods.SuspendState) {
+                                 // 2 == Solid::PowerManagement::SuspendState
+-                                contextMenu.append({itemIndex: 2, itemText: i18n("Suspend to &RAM")})
++                                contextMenu.append({itemIndex: 2, itemText: i18n("Suspend to &RAM"), itemSubMenu: null, itemAllowAmpersand: false})
+                             }
+                             if (spdMethods.HibernateState) {
+                                 // 4 == Solid::PowerManagement::HibernateState
+-                                contextMenu.append({itemIndex: 4, itemText: i18n("Suspend to &Disk")})
++                                contextMenu.append({itemIndex: 4, itemText: i18n("Suspend to &Disk"), itemSubMenu: null, itemAllowAmpersand: false})
+                             }
+                             contextMenu.clicked.connect(shutdownUi.suspendRequested)
+                         }
diff --git a/kde-workspace.spec b/kde-workspace.spec
index eb9e5d7..bc99e7a 100644
--- a/kde-workspace.spec
+++ b/kde-workspace.spec
@@ -12,7 +12,7 @@
 Summary: KDE Workspace
 Name:    kde-workspace
 Version: 4.9.0
-Release: 5%{?dist}
+Release: 6%{?dist}
 
 License: GPLv2
 URL:     https://projects.kde.org/projects/kde/kde-workspace
@@ -117,6 +117,7 @@ Patch59: kde-workspace-4.9.0-fontconfigdir.patch
 Patch100: kde-workspace-4.9-tasks_attention.patch
 Patch101: kde-workspace-4.9-taskmanager_attention.patch
 Patch102: changeset_r9ee6a775d592ec3f105892c32c7576d6cdd7c210.diff
+Patch103: kde-workspace-4.9.1-qmlshutdownoptions.patch
 
 ## plasma active patches
 # adapted version of wac-html-widgets.patch
@@ -455,6 +456,7 @@ Requires: akonadi
 %patch100 -p1 -b .tasks_attention
 %patch101 -p1 -b .taskmanager_attention
 %patch102 -p1 -b .kwin_qml_aurora
+%patch103 -p1 -b .qmlshutdown
 
 # plasma-active
 %patch153 -p1 -b .wac-html-widgets
@@ -1005,6 +1007,9 @@ fi
 
 
 %changelog
+* Mon Aug 27 2012 Lukáš Tinkl <ltinkl at redhat.com> 4.9.0-6
+- Resolves #851887 - KDE Logout does not Suspend to RAM/Disk
+  
 * Tue Aug 21 2012 Rex Dieter <rdieter at fedoraproject.org> 4.9.0-5
 - Add apper to default kickoff favorites (#850445)