[SCM] Kaboom - Debian KDE 3->4 migration tool branch, master, updated. master/0.9.1-37-g3bfb146

[George Kiagiadakis]

The following commit has been merged in the master branch:
commit 3bfb1467f5ca9fc23dcff0bfee75ce54ec32a75d
Author: George Kiagiadakis <gkiagia at users.sourceforge.net>
Date:   Sat Apr 4 19:04:24 2009 +0300

    Also report errors related to filename encoding and fix QTextBrowser's size policy.

diff --git a/diroperations/recursivedirjob.cpp b/diroperations/recursivedirjob.cpp
index c0ca8f7..bce095b 100644
--- a/diroperations/recursivedirjob.cpp
+++ b/diroperations/recursivedirjob.cpp
@@ -319,7 +319,12 @@ void RecursiveDirJobHelper::recursiveCpDir(const QString & sourcePath, const QSt
             }
             else
             {
-                qDebug() << "Ignoring special file" << source.absoluteFilePath(currentName);
+                if ( currentItem.exists() ) {
+                    qDebug() << "Ignoring special file" << source.absoluteFilePath(currentName);
+                } else {
+                    //this can happen with filename encoding bugs
+                    emit errorOccured(Error(Error::NoSuchFileOrDirectory, source.absoluteFilePath(currentName)));
+                }
             }
 
             if ( m_reportProgress ) {
diff --git a/migrationpage.cpp b/migrationpage.cpp
index 212ad9c..76dbeee 100644
--- a/migrationpage.cpp
+++ b/migrationpage.cpp
@@ -41,6 +41,7 @@ MigrationPagePrivate::MigrationPagePrivate(MigrationPage* parent)
   start->setMinimumSize(start->minimumSizeHint().width()+30, start->minimumSizeHint().height()+10);
 
   error = new QTextBrowser;
+  error->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Fixed);
   QPalette pal = error->palette();
   pal.setColor(QPalette::Text, Qt::red);
   error->setPalette(pal);

-- 
Kaboom - Debian KDE 3->4 migration tool