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

[Modestas Vainius]

The following commit has been merged in the master branch:
commit 5cda5afffc47b62f7556f1fda7f059dce775281b
Author: Modestas Vainius <modestas at vainius.eu>
Date:   Tue Mar 31 00:20:41 2009 +0300

    Handle wizard exit value properly.
    
    Signed-off-by: Modestas Vainius <modestas at vainius.eu>

diff --git a/main.cpp b/main.cpp
index ac756b8..9d039f6 100644
--- a/main.cpp
+++ b/main.cpp
@@ -23,6 +23,8 @@
 int main(int argc, char* argv[])
 {
   KaboomSettings settings(argc, argv);
+  int exitvalue;
+
   settings.dump(); // dump settings for debugging purposes
 
   if(settings.stampExists())
@@ -47,12 +49,15 @@ int main(int argc, char* argv[])
   app.installTranslator(&translator);
 
   MigrationTool main;
-  main.show();
-  int exitvalue = app.exec();
-  if(exitvalue==0)
+  exitvalue = main.exec();
+  if(exitvalue == QDialog::Accepted)
   {
-//disable for debugging    QFile(QDir::homePath()+"/.local/kdebian3to4").open(QIODevice::WriteOnly);
+      // disable for debugging
+      // settings.touchStamp();
+      return 0;
+  } else if(exitvalue == QDialog::Rejected) {
+     exitvalue = 1; // Canceled
   }
-  return exitvalue;
 
+  return exitvalue;
 }

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