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

[Sune Vuorela]

The following commit has been merged in the master branch:
commit 6b769c4af054ed6c89c2079c5b24bfd5c89d1d38
Author: Sune Vuorela <pusling at eider.killmulehill.net>
Date:   Thu Apr 2 22:38:42 2009 +0200

    fix up what you can/can't do in error conditions

diff --git a/debian/changelog b/debian/changelog
index b839369..16a01b8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+kaboom (1.0.1) unstable; urgency=low
+
+  * Fix paths. Thanks Lisandro.
+
+ -- Sune Vuorela <debian at pusling.com>  Thu, 02 Apr 2009 20:33:53 +0200
+
 kaboom (1.0.0) unstable; urgency=low
 
   * Let us go live with kaboom. Default to .kde and .kde4. 
diff --git a/migrationpage.cpp b/migrationpage.cpp
index 8aa0988..f760ba9 100644
--- a/migrationpage.cpp
+++ b/migrationpage.cpp
@@ -59,6 +59,7 @@ void MigrationPagePrivate::doMagic()
 {
   start->setEnabled(false);
   errorhandling();
+  q->wizard()->setOptions(q->wizard()->options()|QWizard::DisabledBackButtonOnLastPage); //don't go back during migration.
   q->setTitle(tr("Migration is in progress ..."));
   if(backup)
   {
@@ -110,12 +111,12 @@ void MigrationPagePrivate::doMagic()
   {
     errorhandling(e.what());
   }
-  if (error->text().isEmpty()) // No error
+  if (!error->text().isEmpty()) // if errors, ...
   {
-    complete=true;
-    q->wizard()->setOptions(q->wizard()->options()|QWizard::DisabledBackButtonOnLastPage); //no way back
-    emit q->completeChanged();
+    q->wizard()->setOptions(q->wizard()->options()&QWizard::DisabledBackButtonOnLastPage); //allow people going back now.>
   }
+  complete=true;
+  emit q->completeChanged();
 }
 void MigrationPagePrivate::errorhandling(const QString& err)
 {

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