[SCM] Kaboom - Debian KDE 3->4 migration tool branch, master, updated. dbe3bfda449f39ac0b0d222bfe47eaa31f6ec03c
George Kiagiadakis
gkiagia-guest at alioth.debian.org
Sun Feb 22 19:55:55 UTC 2009
The following commit has been merged in the master branch:
commit dbe3bfda449f39ac0b0d222bfe47eaa31f6ec03c
Author: George Kiagiadakis <gkiagia at users.sourceforge.net>
Date: Sun Feb 22 21:54:57 2009 +0200
Set the label text after calculating dir size, or else calculateDirSize will overwrite it.
diff --git a/diroperations/diroperations.cpp b/diroperations/diroperations.cpp
index 19ed7cd..e56c9d9 100644
--- a/diroperations/diroperations.cpp
+++ b/diroperations/diroperations.cpp
@@ -149,8 +149,8 @@ void recursiveCpDir(const QString & sourcePath, const QString & destPath, CopyOp
qint64 bytesCopied = 0;
if ( pd ) {
- pd->setLabelText(QObject::tr("Copying files..."));
qint64 dirSize = calculateDirSize(sourcePath, pd);
+ pd->setLabelText(QObject::tr("Copying files..."));
if (dirSize > 0) {
pd->setMaximum(dirSize);
//the directory special file is already (almost) copied in dest.mkdir() above
@@ -252,8 +252,8 @@ void recursiveRmDir(const QString & dir, ProgressDialogInterface *pd)
qint64 bytesRemoved = 0;
if ( pd ) {
- pd->setLabelText(QObject::tr("Removing files..."));
qint64 dirSize = calculateDirSize(dir, pd);
+ pd->setLabelText(QObject::tr("Removing files..."));
if (dirSize > 0) {
pd->setMaximum(dirSize);
} else {
--
Kaboom - Debian KDE 3->4 migration tool
More information about the pkg-kde-commits
mailing list