[kdebase-workspace] plasma konsole patch rebased

[Jaroslav Reznik]

commit 66e9b04f9afbb0c114df3884563573f21a888d7c
Author: Jaroslav Reznik <jreznik at redhat.com>
Date:   Fri Aug 6 10:33:32 2010 +0200

    plasma konsole patch rebased

 ...=> kdebase-workspace-4.5.0-plasma-konsole.patch |   22 ++++++++++----------
 kdebase-workspace.spec                             |    2 +-
 2 files changed, 12 insertions(+), 12 deletions(-)
---
diff --git a/kdebase-workspace-4.3.98-plasma-konsole.patch b/kdebase-workspace-4.5.0-plasma-konsole.patch
similarity index 62%
rename from kdebase-workspace-4.3.98-plasma-konsole.patch
rename to kdebase-workspace-4.5.0-plasma-konsole.patch
index 64cab7a..b31927a 100644
--- a/kdebase-workspace-4.3.98-plasma-konsole.patch
+++ b/kdebase-workspace-4.5.0-plasma-konsole.patch
@@ -1,6 +1,6 @@
-diff -up kdebase-workspace-4.3.98/plasma/generic/containmentactions/contextmenu/menu.cpp.plasma-konsole kdebase-workspace-4.3.98/plasma/generic/containmentactions/contextmenu/menu.cpp
---- kdebase-workspace-4.3.98/plasma/generic/containmentactions/contextmenu/menu.cpp.plasma-konsole	2010-01-31 13:30:37.000000000 -0600
-+++ kdebase-workspace-4.3.98/plasma/generic/containmentactions/contextmenu/menu.cpp	2010-01-31 19:19:23.000000000 -0600
+diff -up kdebase-workspace-4.5.0/plasma/generic/containmentactions/contextmenu/menu.cpp.plasma-konsole kdebase-workspace-4.5.0/plasma/generic/containmentactions/contextmenu/menu.cpp
+--- kdebase-workspace-4.5.0/plasma/generic/containmentactions/contextmenu/menu.cpp.plasma-konsole	2010-07-28 23:04:55.000000000 +0200
++++ kdebase-workspace-4.5.0/plasma/generic/containmentactions/contextmenu/menu.cpp	2010-08-06 10:25:07.409329979 +0200
 @@ -30,6 +30,7 @@
  #include <KDebug>
  #include <KIcon>
@@ -21,10 +21,10 @@ diff -up kdebase-workspace-4.3.98/plasma/generic/containmentactions/contextmenu/
          defaultEnabled << true << true << true << true << true;
      } else {
          //FIXME ugly code!
--        m_allActions << "_context" << "_run_command" << "add widgets" << "_add panel" << "add sibling containment" << "remove" << "lock widgets" << "zoom in" << "zoom out" << "_sep1" << "_lock_screen" << "_logout" << "_sep2" << "configure" << "configure shortcuts" << "_sep3" << "_wallpaper";
--        defaultEnabled << true << true << true << true << false << true << true << false << false << true << true << true << true << true << false << true << true;
-+        m_allActions << "_context" << "_run_konsole" << "_run_command" << "add widgets" << "_add panel" << "add sibling containment" << "remove" << "lock widgets" << "zoom in" << "zoom out" << "_sep1" << "_lock_screen" << "_logout" << "_sep2" << "configure" << "configure shortcuts" << "_sep3" << "_wallpaper";
-+        defaultEnabled << true << true << true << true << true << false << true << true << false << false << true << true << true << true << true << false << true << true;
+-        m_allActions << "_context" << "_run_command" << "add widgets" << "_add panel" << "add sibling containment" << "manage activities" << "remove" << "lock widgets" << "_sep1" << "_lock_screen" << "_logout" << "_sep2" << "configure" << "configure shortcuts" << "_sep3" << "_wallpaper";
+-        defaultEnabled << true << true << true << true << false << true << true << true << true << true << true << true << true << false << true << true;
++        m_allActions << "_context" << "_run_konsole" << "_run_command" << "add widgets" << "_add panel" << "add sibling containment" << "manage activities" << "remove" << "lock widgets" << "_sep1" << "_lock_screen" << "_logout" << "_sep2" << "configure" << "configure shortcuts" << "_sep3" << "_wallpaper";
++        defaultEnabled << true << true << true << true << true << false << true << true << true << true << true << true << true << true << false << true << true;
      }
  
      for (int i = 0; i < m_allActions.count(); ++i) {
@@ -48,7 +48,7 @@ diff -up kdebase-workspace-4.3.98/plasma/generic/containmentactions/contextmenu/
      } else if (name == "_run_command") {
          if (KAuthorized::authorizeKAction("run_command")) {
              return m_runCommandAction;
-@@ -198,6 +206,11 @@ QAction *ContextMenu::action(const QStri
+@@ -202,6 +210,11 @@ QAction *ContextMenu::action(const QStri
      return 0;
  }
  
@@ -60,9 +60,9 @@ diff -up kdebase-workspace-4.3.98/plasma/generic/containmentactions/contextmenu/
  void ContextMenu::runCommand()
  {
      if (!KAuthorized::authorizeKAction("run_command")) {
-diff -up kdebase-workspace-4.3.98/plasma/generic/containmentactions/contextmenu/menu.h.plasma-konsole kdebase-workspace-4.3.98/plasma/generic/containmentactions/contextmenu/menu.h
---- kdebase-workspace-4.3.98/plasma/generic/containmentactions/contextmenu/menu.h.plasma-konsole	2010-01-31 13:30:37.000000000 -0600
-+++ kdebase-workspace-4.3.98/plasma/generic/containmentactions/contextmenu/menu.h	2010-01-31 19:17:49.000000000 -0600
+diff -up kdebase-workspace-4.5.0/plasma/generic/containmentactions/contextmenu/menu.h.plasma-konsole kdebase-workspace-4.5.0/plasma/generic/containmentactions/contextmenu/menu.h
+--- kdebase-workspace-4.5.0/plasma/generic/containmentactions/contextmenu/menu.h.plasma-konsole	2010-02-03 09:50:02.000000000 +0100
++++ kdebase-workspace-4.5.0/plasma/generic/containmentactions/contextmenu/menu.h	2010-08-06 10:21:11.871329425 +0200
 @@ -41,12 +41,14 @@ public:
      void save(KConfigGroup &config);
  
diff --git a/kdebase-workspace.spec b/kdebase-workspace.spec
index 3ffa2b3..8b28aa0 100644
--- a/kdebase-workspace.spec
+++ b/kdebase-workspace.spec
@@ -22,7 +22,7 @@ Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdebase-workspace-%{ver
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Patch1: kdebase-workspace-4.4.80-redhat-startkde.patch
-Patch2: kdebase-workspace-4.3.98-plasma-konsole.patch
+Patch2: kdebase-workspace-4.5.0-plasma-konsole.patch
 Patch3: kdebase-workspace-4.4.92-systemsettings_onlyshowin_kde.patch
 %if 0%{?polkit_1}
 Patch4: kdebase-workspace-4.3.95-ck-shutdown.patch