rpms/kdebase-workspace/devel kdebase-workspace-4.2.1-plasma-konsole.patch, NONE, 1.1 kdebase-workspace.spec, 1.199, 1.200 kdebase-workspace-4.1.72-plasma-konsole.patch, 1.1, NONE

[Than Ngo]

Author: than

Update of /cvs/extras/rpms/kdebase-workspace/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3750

Modified Files:
	kdebase-workspace.spec 
Added Files:
	kdebase-workspace-4.2.1-plasma-konsole.patch 
Removed Files:
	kdebase-workspace-4.1.72-plasma-konsole.patch 
Log Message:
fix konsole patch to use invokeTerminal


kdebase-workspace-4.2.1-plasma-konsole.patch:

--- NEW FILE kdebase-workspace-4.2.1-plasma-konsole.patch ---
diff -up kdebase-workspace-4.2.1/plasma/containments/desktop/desktop.cpp.plasma-konsole kdebase-workspace-4.2.1/plasma/containments/desktop/desktop.cpp
--- kdebase-workspace-4.2.1/plasma/containments/desktop/desktop.cpp.plasma-konsole	2008-12-21 21:19:14.000000000 +0100
+++ kdebase-workspace-4.2.1/plasma/containments/desktop/desktop.cpp	2009-03-10 13:33:38.000000000 +0100
@@ -39,6 +39,7 @@
 #include <KRun>
 #include <KStandardDirs>
 #include <KWindowSystem>
+#include <ktoolinvocation.h>
 
 #include <Plasma/Corona>
 #include <Plasma/Animator>
@@ -61,6 +62,7 @@ DefaultDesktop::DefaultDesktop(QObject *
       m_lockDesktopAction(0),
       m_appletBrowserAction(0),
       m_addPanelAction(0),
+      m_runKonsoleAction(0),
       m_runCommandAction(0),
       m_lockScreenAction(0),
       m_logoutAction(0),
@@ -151,6 +153,11 @@ void DefaultDesktop::runCommand()
     krunner.display();
 }
 
+void DefaultDesktop::runKonsole()
+{
+    KToolInvocation::invokeTerminal(QString(), QDir::homePath());
+}
+
 void DefaultDesktop::lockScreen()
 {
     if (!KAuthorized::authorizeKAction("lock_screen")) {
@@ -180,6 +187,10 @@ QList<QAction*> DefaultDesktop::contextu
         connect(m_addPanelAction, SIGNAL(triggered(bool)), this, SLOT(addPanel()));
         m_addPanelAction->setIcon(KIcon("list-add"));
 
+        m_runKonsoleAction = new QAction(i18n("Konsole"), this);
+        connect(m_runKonsoleAction, SIGNAL(triggered(bool)), this, SLOT(runKonsole()));
+        m_runKonsoleAction->setIcon(KIcon("terminal"));
+
         m_runCommandAction = new QAction(i18n("Run Command..."), this);
         connect(m_runCommandAction, SIGNAL(triggered(bool)), this, SLOT(runCommand()));
         m_runCommandAction->setIcon(KIcon("system-run"));
@@ -202,6 +213,8 @@ QList<QAction*> DefaultDesktop::contextu
 
     QList<QAction*> actions;
 
+    actions.append(m_runKonsoleAction);
+
     if (KAuthorized::authorizeKAction("run_command")) {
         actions.append(m_runCommandAction);
     }
diff -up kdebase-workspace-4.2.1/plasma/containments/desktop/desktop.h.plasma-konsole kdebase-workspace-4.2.1/plasma/containments/desktop/desktop.h
--- kdebase-workspace-4.2.1/plasma/containments/desktop/desktop.h.plasma-konsole	2008-12-10 17:13:23.000000000 +0100
+++ kdebase-workspace-4.2.1/plasma/containments/desktop/desktop.h	2009-03-10 12:55:20.000000000 +0100
@@ -69,6 +69,7 @@ protected:
     void dropEvent(QGraphicsSceneDragDropEvent *event);
 
 protected Q_SLOTS:
+    void runKonsole();
     void runCommand();
 
     void lockScreen();
@@ -85,6 +86,7 @@ private:
     QAction *m_lockDesktopAction;
     QAction *m_appletBrowserAction;
     QAction *m_addPanelAction;
+    QAction *m_runKonsoleAction;
     QAction *m_runCommandAction;
     QAction *m_setupDesktopAction;
     QAction *m_lockScreenAction;


Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebase-workspace/devel/kdebase-workspace.spec,v
retrieving revision 1.199
retrieving revision 1.200
diff -u -r1.199 -r1.200
--- kdebase-workspace.spec	9 Mar 2009 17:25:05 -0000	1.199
+++ kdebase-workspace.spec	10 Mar 2009 13:29:02 -0000	1.200
@@ -8,7 +8,7 @@
 Name: kdebase-workspace
 Version: 4.2.1
 
-Release: 5%{?dist}
+Release: 6%{?dist}
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdebase-workspace-%{version}.tar.bz2
 License: GPLv2
 Group: User Interface/Desktops
@@ -16,7 +16,7 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Patch1: kdebase-workspace-4.2.1-redhat-startkde.patch
-Patch2: kdebase-workspace-4.1.72-plasma-konsole.patch
+Patch2: kdebase-workspace-4.2.1-plasma-konsole.patch
 Patch3: kdebase-workspace-4.2.0-show-systemsettings.patch
 Patch4: kdebase-workspace-4.0.72-ck-shutdown.patch
 #Â 434824: KDE4 System Settings - No Method To Enter Administrative Mode
@@ -376,6 +376,9 @@
 
 
 %changelog
+* Tue Mar 10 2009 Than Ngo <than at redhat.com> - 4.2.1-6
+- fix konsole patch to use invokeTerminal
+
 * Mon Mar  9 2009 Lukáš Tinkl <ltinkl at redhat.com> - 4.2.1-5
 - fix pager not displaying desktop numbers (kdebug#184152)
 


--- kdebase-workspace-4.1.72-plasma-konsole.patch DELETED ---