CVS commit by waba: Fixes M +2 -2 kioskrun.cpp 1.42 M +8 -0 profileConfigDialog.cpp 1.4 --- kdeextragear-3/kiosktool/kioskrun.cpp #1.41:1.42 @@ -1122,8 +1122,8 @@ KioskRun::move(const QString &source, co kdDebug() << "Moving " << src << " --> " << dest << endl; - if (!createRemoteDirRecursive(dest, false)) + if (!createRemoteDirRecursive(dest.upURL(), false)) return false; - if (!NETACCESS::move(src, dest, kapp->mainWidget())) + if (!NETACCESS::file_move(src, dest, -1, true, false, kapp->mainWidget())) { // TODO add error message + retry --- kdeextragear-3/kiosktool/profileConfigDialog.cpp #1.3:1.4 @@ -178,4 +178,7 @@ bool ProfileConfigDialog::save() } + if (!installDir.endsWith("/")) + installDir.append("/"); + if (!m_origInstallDir.isEmpty() && (installDir != m_origInstallDir)) { @@ -199,4 +202,9 @@ bool ProfileConfigDialog::save() if (!KioskRun::self()->move(m_origInstallDir, installDir, fileList)) return false; + if (QDir(m_origInstallDir).exists()) + { + if (!KioskRun::self()->remove(m_origInstallDir)) + return false; + } }