3 files changed, 22 insertions, 2 deletions

diff --git a/core/apps/calibrate/calibrate.cpp b/core/apps/calibrate/calibrate.cpp
index b9ad73d..6d498bc 100644
--- a/core/apps/calibrate/calibrate.cpp
+++ b/core/apps/calibrate/calibrate.cpp
@@ -18,17 +18,17 @@
 **
 **********************************************************************/
 
 #include <math.h>
 
 #include "calibrate.h"
 
 #include <qpe/resource.h>
-
+#include <qpe/qcopenvelope_qws.h>
 #include <qapplication.h>
 
 #if defined(Q_WS_QWS) || defined(_WS_QWS_)
 
 #include <qpainter.h>
 #include <qtimer.h>
 #include <qwindowsystem_qws.h>
 #include <qgfx_qws.h>
@@ -75,18 +75,25 @@ void Calibrate::show()
 
 void Calibrate::store()
 {
 	QWSServer::mouseHandler() ->calibrate( &goodcd );
 }
 
 void Calibrate::hide()
 {
-	if ( isVisible() )
+	if ( isVisible ( )) {
 		store();
+
+		// hack - calibrate is a launcher dialog, but treated like a standalone app
+		{
+			QCopEnvelope e( "QPE/System", "closing(QString)" );
+			e << QString ( "calibrate" );
+		}                        
+	}
 	QDialog::hide();
 }
 
 void Calibrate::reset()
 {
 	penPos = QPoint();
 	location = QWSPointerCalibrationData::TopLeft;
 	crossPos = fromDevice( cd.screenPoints[ location ] );
diff --git a/core/launcher/shutdownimpl.cpp b/core/launcher/shutdownimpl.cpp
index b1925d9..9292bb8 100644
--- a/core/launcher/shutdownimpl.cpp
+++ b/core/launcher/shutdownimpl.cpp
@@ -16,16 +16,17 @@
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
 
 #include "shutdownimpl.h"
 
 #include <qpe/global.h>
+#include <qpe/qcopenvelope_qws.h>
 
 #include <qtimer.h>
 #include <qprogressbar.h>
 #include <qpushbutton.h>
 #include <qbuttongroup.h>
 #include <qlabel.h>
 #include <qlayout.h>
 #include <qpalette.h>
@@ -160,9 +161,19 @@ void ShutdownImpl::timeout ( )
 		m_progress-> hide ( );
 		m_timer-> stop ( );
 		emit shutdown ( m_operation );
 	}
 	else
 		m_progress-> setProgress ( m_counter );
 }
 
+void ShutdownImpl::hide ( )
+{
+	if ( isVisible ( )) {
+		// hack - shutdown is a launcher dialog, but treated like a standalone app
+		QCopEnvelope e( "QPE/System", "closing(QString)" );
+		e << QString ( "shutdown" );
+	
+	}
+	QWidget::hide ( );
+}
 
diff --git a/core/launcher/shutdownimpl.h b/core/launcher/shutdownimpl.h
index c2ebcc7..12b859d 100644
--- a/core/launcher/shutdownimpl.h
+++ b/core/launcher/shutdownimpl.h
@@ -29,16 +29,18 @@ class QProgressBar;
 class ShutdownImpl : public QWidget
 {
 	Q_OBJECT
 public:
 	ShutdownImpl( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
 
 	enum Type { ShutdownSystem, RebootSystem, RestartDesktop, TerminateDesktop };
 
+	virtual void hide ( );
+
 signals:
 	void shutdown( ShutdownImpl::Type );
 
 private slots:
 	void buttonClicked( int );
 	void cancelClicked();
 	void timeout();