Revert the attempt to split calibrate, as it failed miserably.

1 files changed, 6 insertions, 9 deletions

diff --git a/core/launcher/main.cpp b/core/launcher/main.cpp
index e96eeae..20a1ecd 100644
--- a/core/launcher/main.cpp
+++ b/core/launcher/main.cpp
@@ -32,3 +32,2 @@
 #include <opie/odevice.h>
-#include <opie/oprocess.h>
 
@@ -47,2 +46,4 @@
 
+#include "../calibrate/calibrate.h"
+
 using namespace Opie;
@@ -119,10 +120,6 @@ int initApplication( int argc, char ** argv )
         if ( !QFile::exists( "/etc/pointercal" ) ) {
-            OProcess cal;
-            cal << "calibrate";
-          
-            if ( ! cal.start(OProcess::Block, OProcess::NoCommunication) ) {
-                QMessageBox::warning( 0, "Unable to calibrate",
-                    "Failed to start the calibration tool.\n"
-                );
-            }
+            // Make sure calibration widget starts on top.
+            Calibrate *cal = new Calibrate;
+            cal->exec();
+            delete cal;
         }