summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichele Calgaro <michele.calgaro@yahoo.it>2020-02-13 14:50:47 +0900
committerMichele Calgaro <michele.calgaro@yahoo.it>2020-02-13 14:50:47 +0900
commit8b269b0658abb58555ea079126033ac9f8f0833c (patch)
tree9761d5214c78645d8b3f1a3c37689af0b2fb7687
parent4ce5ad8c3c1fa5a972901232ef2187c857bc89f8 (diff)
downloadtdebase-8b269b06.zip
tdebase-8b269b06.tar.gz
Fixed handling of alternative terminal application in MiniCli.
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
-rw-r--r--kdesktop/kdesktop.kcfg10
-rw-r--r--kdesktop/minicli.cpp4
2 files changed, 7 insertions, 7 deletions
diff --git a/kdesktop/kdesktop.kcfg b/kdesktop/kdesktop.kcfg
index 8086ad8..53a1cc7 100644
--- a/kdesktop/kdesktop.kcfg
+++ b/kdesktop/kdesktop.kcfg
@@ -69,6 +69,11 @@
<!-- krootwm.cc:496 -->
<!-- config->writeEntry( "SortDirectoriesFirst", b ); -->
</entry>
+ <entry key="TerminalApplication" type="Path">
+ <default>konsole</default>
+ <label>Terminal application</label>
+ <whatsthis>Defines which terminal application is used.</whatsthis>
+ </entry>
</group>
<group name="Mouse Buttons">
<entry key="WheelSwitchesWorkspace" type="Bool">
@@ -83,11 +88,6 @@
<!-- desktop.cc:397 -->
<!-- (config->readEntry("WheelDirection", default_dir_string) == forward_string) ? Forward : Reverse; -->
</entry>
- <entry key="TerminalApplication" type="Path">
- <default>konsole</default>
- <label>Terminal application</label>
- <whatsthis>Defines which terminal application is used.</whatsthis>
- </entry>
<entry key="Left" type="String">
<default></default>
<label>Left Mouse Button Action</label>
diff --git a/kdesktop/minicli.cpp b/kdesktop/minicli.cpp
index 4b8d390..769c498 100644
--- a/kdesktop/minicli.cpp
+++ b/kdesktop/minicli.cpp
@@ -385,10 +385,10 @@ void Minicli::keyPressEvent( TQKeyEvent* e )
TQDialog::keyPressEvent( e );
}
-TQString Minicli::terminalCommand (const TQString& cmd, const TQString& args)
+TQString Minicli::terminalCommand(const TQString& cmd, const TQString& args)
{
TQString terminal = KDesktopSettings::terminalApplication().stripWhiteSpace();
- if (terminal.endsWith("konsole"))
+ if (terminal.startsWith("konsole"))
terminal += " --noclose";
if( args.isEmpty() )