1 files changed, 9 insertions, 6 deletions

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