mirror/konsole
1
0
Fork 0
mirror of https://github.com/KDE/konsole.git synced 2026-05-04 12:44:23 -04:00
Code Issues Packages Projects Releases Wiki Activity

remove code which is duplicated and effectively of no-use .

Browse Source 
The fallback sequence for terminal command is not defined within
Session::checkProgram() anymore.
This commit is contained in:
Jekyll Wu
2011-08-11 05:36:57 +08:00
parent 1628bc54cb
commit 016061eb60
1 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/Session.cpp
View File

@@ -352,20 +352,13 @@ QString Session::checkProgram(const QString& program) const
if (exec.isEmpty())
return QString();
// if 'exec' is not specified, fall back to default shell. if that
// is not set then fall back to /bin/sh
if ( exec.isEmpty() )
exec = qgetenv("SHELL");
if ( exec.isEmpty() )
exec = "/bin/sh";
exec = KRun::binaryName(exec, false);
exec = KShell::tildeExpand(exec);
QString pexec = KGlobal::dirs()->findExe(exec);
if ( pexec.isEmpty() )
{
kError() << i18n("Could not find binary: ") << exec;
return QString();
return QString();
}
return exec;
@@ -412,6 +405,8 @@ void Session::run()
}
const int CHOICE_COUNT = 3;
// if '_program' is empty , fall back to default shell. If that is not set
// then fall back to /bin/sh
QString programs[CHOICE_COUNT] = {_program,qgetenv("SHELL"),"/bin/sh"};
QString exec;
int choice = 0;