rpms/kdebase-workspace/F-11 kdebase-workspace-4.3.1-classicmenu-logout.patch, NONE, 1.1 kdebase-workspace.spec, 1.243, 1.244 kdebase-workspace-4.3.0-classicmenu-logout.patch, 1.1, NONE

[Kevin Kofler]

Author: kkofler

Update of /cvs/pkgs/rpms/kdebase-workspace/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5854/F-11

Modified Files:
	kdebase-workspace.spec 
Added Files:
	kdebase-workspace-4.3.1-classicmenu-logout.patch 
Removed Files:
	kdebase-workspace-4.3.0-classicmenu-logout.patch 
Log Message:
* Sun Sep 27 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.1-9
- fix classicmenu-logout ("Leave...") patch

kdebase-workspace-4.3.1-classicmenu-logout.patch:
 core/itemhandlers.cpp         |    7 ++++++-
 simpleapplet/simpleapplet.cpp |    4 ++++
 simpleapplet/simpleapplet.h   |    3 ++-
 3 files changed, 12 insertions(+), 2 deletions(-)

--- NEW FILE kdebase-workspace-4.3.1-classicmenu-logout.patch ---
diff -ur kdebase-workspace-4.3.1/plasma/applets/kickoff/core/itemhandlers.cpp kdebase-workspace-4.3.1-classicmenu-logout/plasma/applets/kickoff/core/itemhandlers.cpp
--- kdebase-workspace-4.3.1/plasma/applets/kickoff/core/itemhandlers.cpp	2009-06-03 13:54:20.000000000 +0200
+++ kdebase-workspace-4.3.1-classicmenu-logout/plasma/applets/kickoff/core/itemhandlers.cpp	2009-09-28 01:19:26.000000000 +0200
@@ -109,7 +109,8 @@
         QTimer::singleShot(0, this, SLOT(switchUser()));
         return true;
     } else if (m_logoutAction == "logout" || m_logoutAction == "logoutonly" ||
-               m_logoutAction == "restart" || m_logoutAction == "shutdown") {
+               m_logoutAction == "restart" || m_logoutAction == "shutdown" ||
+               m_logoutAction == "leave") {
         // decouple dbus call, otherwise we'll run into a dead-lock
         QTimer::singleShot(0, this, SLOT(logout()));
         return true;
@@ -160,6 +161,10 @@
         type = KWorkSpace::ShutdownTypeReboot;
     } else if (m_logoutAction == "shutdown") {
         type = KWorkSpace::ShutdownTypeHalt;
+    } else if (m_logoutAction == "leave") {
+        // This one brings up the dialog, for use in the classic menu.
+        confirm = KWorkSpace::ShutdownConfirmYes;
+        type = KWorkSpace::ShutdownTypeDefault;
     }
 
 //FIXME: the proper fix is to implement the KWorkSpace methods for Windows
diff -ur kdebase-workspace-4.3.1/plasma/applets/kickoff/simpleapplet/simpleapplet.cpp kdebase-workspace-4.3.1-classicmenu-logout/plasma/applets/kickoff/simpleapplet/simpleapplet.cpp
--- kdebase-workspace-4.3.1/plasma/applets/kickoff/simpleapplet/simpleapplet.cpp	2009-06-09 18:08:02.000000000 +0200
+++ kdebase-workspace-4.3.1-classicmenu-logout/plasma/applets/kickoff/simpleapplet/simpleapplet.cpp	2009-09-28 01:18:25.000000000 +0200
@@ -187,6 +187,7 @@
             case Shutdown:                 return i18n("Shutdown");
             case Logout:                   return i18n("Logout");
             case Leave:                    return i18n("Leave");
+            case LeaveDialog:              return i18n("Leave...");
         }
         return QString();
     }
@@ -212,6 +213,7 @@
             case Shutdown:                 return "system-shutdown";
             case Logout:                   return "system-log-out";
             case Leave:                    return "system-shutdown";
+            case LeaveDialog:              return "system-shutdown";
         }
         return QString();
     }
@@ -652,6 +654,8 @@
                 d->menuview->addAction(KIcon(d->viewIcon(LockScreen)), d->viewText(LockScreen))->setData(KUrl("leave:/lock"));
             } else if(vtname == "Logout") {
                 d->menuview->addAction(KIcon(d->viewIcon(Logout)), d->viewText(Logout))->setData(KUrl("leave:/logout"));
+            } else if(vtname == "LeaveDialog") {
+                d->menuview->addAction(KIcon(d->viewIcon(LeaveDialog)), d->viewText(LeaveDialog))->setData(KUrl("leave:/leave"));
             } else if(vtname == "Leave") {
                 Kickoff::LeaveModel *leavemodel = new Kickoff::LeaveModel(d->menuview);
                 leavemodel->updateModel();
diff -ur kdebase-workspace-4.3.1/plasma/applets/kickoff/simpleapplet/simpleapplet.h kdebase-workspace-4.3.1-classicmenu-logout/plasma/applets/kickoff/simpleapplet/simpleapplet.h
--- kdebase-workspace-4.3.1/plasma/applets/kickoff/simpleapplet/simpleapplet.h	2009-03-27 15:46:41.000000000 +0100
+++ kdebase-workspace-4.3.1-classicmenu-logout/plasma/applets/kickoff/simpleapplet/simpleapplet.h	2009-09-28 01:18:25.000000000 +0200
@@ -59,7 +59,8 @@
         Restart, ///< Restart Action
         Shutdown, ///< Shutdown Action
         Logout, ///< Logout Action
-        Leave ///< Leave Menu
+        Leave, ///< Leave Menu
+        LeaveDialog ///< Leave Dialog Action
     };
 
     /**


Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/F-11/kdebase-workspace.spec,v
retrieving revision 1.243
retrieving revision 1.244
diff -u -p -r1.243 -r1.244
--- kdebase-workspace.spec	27 Sep 2009 13:47:49 -0000	1.243
+++ kdebase-workspace.spec	27 Sep 2009 23:25:06 -0000	1.244
@@ -8,7 +8,7 @@ Summary: K Desktop Environment - Workspa
 Name: kdebase-workspace
 Version: 4.3.1
 
-Release: 8%{?dist}
+Release: 9%{?dist}
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdebase-workspace-%{version}.tar.bz2
 License: GPLv2
 Group: User Interface/Desktops
@@ -34,7 +34,7 @@ Patch16: kdebase-workspace-4.3.0-battery
 # allow adding a "Leave..." button which brings up the complete shutdown dialog
 # to the classic menu (as in KDE <= 4.2.x); the default is still the upstream
 # default Leave submenu
-Patch17: kdebase-workspace-4.3.0-classicmenu-logout.patch
+Patch17: kdebase-workspace-4.3.1-classicmenu-logout.patch
 
 # upstream patches:
 # 4.3 branch
@@ -605,6 +605,9 @@ fi
 
 
 %changelog
+* Sun Sep 27 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.1-9
+- fix classicmenu-logout ("Leave...") patch
+
 * Sun Sep 27 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.1-8
 - support "Leave..." which brings up complete shutdown dialog in classic menu
 


--- kdebase-workspace-4.3.0-classicmenu-logout.patch DELETED ---