Split calibrate out as a standalone application, and ensure taskbar depends

on it.  This makes ts debugging easier, having a seperate calibration tool
around, and as a side affect fixes calibration on the C700, which previously
required a reboot to take effect.

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
@@ -30,6 +30,7 @@
 #endif
 
 #include <opie/odevice.h>
+#include <opie/oprocess.h>
 
 #include <qmessagebox.h>
 #include <qfile.h>
@@ -44,8 +45,6 @@
 #include <signal.h>
 #include <unistd.h>
 
-#include "../calibrate/calibrate.h"
-
 using namespace Opie;
 
 void initEnvironment()
@@ -118,10 +117,14 @@ 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"
+		);
+            }
 	}
     }