[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kde-workspace/KDE/4.11] libs/taskmanager: Fix last commit (was applied at wrong line)
From:       Christoph Feck <christoph () maxiom ! de>
Date:       2013-10-04 12:45:04
Message-ID: E1VS4ki-0008HY-3M () scm ! kde ! org
[Download RAW message or body]

Git commit f5ced0581de731f09c7dbc296e4039d90c2bfcff by Christoph Feck.
Committed on 04/10/2013 at 12:44.
Pushed by cfeck into branch 'KDE/4.11'.

Fix last commit (was applied at wrong line)

M  +2    -2    libs/taskmanager/launcheritem.cpp

http://commits.kde.org/kde-workspace/f5ced0581de731f09c7dbc296e4039d90c2bfcff

diff --git a/libs/taskmanager/launcheritem.cpp b/libs/taskmanager/launcheritem.cpp
index ac94732..5e9f68c 100644
--- a/libs/taskmanager/launcheritem.cpp
+++ b/libs/taskmanager/launcheritem.cpp
@@ -299,7 +299,7 @@ QString LauncherItem::defaultApplication() const
         return browserApp;
     } else if (application.compare("terminal", Qt::CaseInsensitive) == 0) {
         KConfigGroup confGroup(KGlobal::config(), "General");
-        return confGroup.readPathEntry("TerminalApplication", QString::fromLatin1("kwin"));
+        return confGroup.readPathEntry("TerminalApplication", QString::fromLatin1("konsole"));
     } else if (application.compare("filemanager", Qt::CaseInsensitive) == 0) {
         KService::Ptr service = KMimeTypeTrader::self()->preferredService("inode/directory");
         if (service) {
@@ -308,7 +308,7 @@ QString LauncherItem::defaultApplication() const
     } else if (application.compare("windowmanager", Qt::CaseInsensitive) == 0) {
         KConfig cfg("ksmserverrc", KConfig::NoGlobals);
         KConfigGroup confGroup(&cfg, "General");
-        return confGroup.readEntry("windowManager", QString::fromLatin1("konsole"));
+        return confGroup.readEntry("windowManager", QString::fromLatin1("kwin"));
     } else if (KService::Ptr service = KMimeTypeTrader::self()->preferredService(application)) {
         return service->storageId();
     } else {
[prev in list] [next in list] [prev in thread] [next in thread]