1 files changed, 3 insertions, 3 deletions

diff --git a/core/launcher/desktop.cpp b/core/launcher/desktop.cpp
index 5ecc8bf..ba4fd66 100644
--- a/core/launcher/desktop.cpp
+++ b/core/launcher/desktop.cpp
@@ -647,203 +647,203 @@ void Desktop::execAutoStart()
 #include <fcntl.h>
 #include <unistd.h>
 #include <errno.h>
 #include <linux/ioctl.h>
 #include <time.h>
 #endif
 
 
 void Desktop::togglePower()
 {
 	static bool excllock = false;
 
 	qDebug ( "togglePower (locked == %d)", excllock ? 1 : 0 );
 
 	if ( excllock )
 		return ;
 
 	excllock = true;
 
 	bool wasloggedin = loggedin;
 	loggedin = 0;
 	suspendTime = QDateTime::currentDateTime();
 
 #ifdef QWS
 
 	if ( Password::needToAuthenticate ( true ) && qt_screen ) {
 		// Should use a big black window instead.
 		// But this would not show up fast enough
 		QGfx *g = qt_screen-> screenGfx ( );
 		g-> fillRect ( 0, 0, qt_screen-> width ( ), qt_screen-> height ( ));
 		delete g;
 	}
 #endif
 
 	ODevice::inst ( )-> suspend ( );
 
 	DesktopApplication::switchLCD ( true ); // force LCD on without slow qcop call
 	QWSServer::screenSaverActivate ( false );
 
 	{
 		QCopEnvelope( "QPE/Card", "mtabChanged()" ); // might have changed while asleep
 	}
 
 	if ( wasloggedin )
 		login ( true );
 
 	execAutoStart();
 	//qcopBridge->closeOpenConnections();
 
 	excllock = false;
 }
 
 void Desktop::toggleLight()
 {
 	QCopEnvelope e( "QPE/System", "setBacklight(int)" );
 	e << -2; // toggle
 }
 
 void Desktop::toggleSymbolInput()
 {
 	tb->toggleSymbolInput();
 }
 
 void Desktop::toggleNumLockState()
 {
 	tb->toggleNumLockState();
 }
 
 void Desktop::toggleCapsLockState()
 {
 	tb->toggleCapsLockState();
 }
 
 void Desktop::styleChange( QStyle &s )
 {
 	QWidget::styleChange( s );
 	int displayw = qApp->desktop() ->width();
 	int displayh = qApp->desktop() ->height();
 
 	QSize sz = tb->sizeHint();
 
 	tb->setGeometry( 0, displayh - sz.height(), displayw, sz.height() );
 }
 
 void DesktopApplication::shutdown()
 {
 	if ( type() != GuiServer )
 		return ;
 	ShutdownImpl *sd = new ShutdownImpl( 0, 0, WDestructiveClose );
 	connect( sd, SIGNAL( shutdown( ShutdownImpl::Type ) ),
 	         this, SLOT( shutdown( ShutdownImpl::Type ) ) );
 	sd->showMaximized();
 }
 
 void DesktopApplication::shutdown( ShutdownImpl::Type t )
 {
-	char *path[] = { "/sbin", "/usr/sbin", 0 };
 	char *opt = 0;
 
 	switch ( t ) {
 		case ShutdownImpl::ShutdownSystem:
 			opt = "-h";
 			// fall through
 		case ShutdownImpl::RebootSystem:
 			if ( opt == 0 )
 				opt = "-r";
 
-			if ( execle( "shutdown", "shutdown", opt, "now", ( void* ) 0, path ) < 0 )
-				::syslog ( LOG_ERR, "Erroring execing shutdown\n" );
+			if ( execl( "/sbin/shutdown", "shutdown", opt, "now", ( void* ) 0) < 0 )
+				perror("shutdown");
+//				::syslog ( LOG_ERR, "Erroring execing shutdown\n" );
 
 			break;
 		case ShutdownImpl::RestartDesktop:
 			restart();
 			break;
 		case ShutdownImpl::TerminateDesktop:
 			prepareForTermination( FALSE );
 
 			// This is a workaround for a Qt bug
 			// clipboard applet has to stop its poll timer, or Qt/E
 			// will hang on quit() right before it emits aboutToQuit()
 			emit aboutToQuit ( );
 
 			quit();
 			break;
 	}
 }
 
 void DesktopApplication::restart()
 {
 	prepareForTermination( TRUE );
 
 #ifdef Q_WS_QWS
 
 	for ( int fd = 3; fd < 100; fd++ )
 		close( fd );
 #if defined(QT_DEMO_SINGLE_FLOPPY)
 
 	execl( "/sbin/init", "qpe", 0 );
 #elif defined(QT_QWS_CASSIOPEIA)
 
 	execl( "/bin/sh", "sh", 0 );
 #else
 
 	execl( ( qpeDir() + "/bin/qpe" ).latin1(), "qpe", 0 );
 #endif
 
 	exit( 1 );
 #endif
 }
 
 void Desktop::startTransferServer()
 {
 	// start qcop bridge server
 	qcopBridge = new QCopBridge( 4243 );
 	if ( !qcopBridge->ok() ) {
 		delete qcopBridge;
 		qcopBridge = 0;
 	}
 	// start transfer server
 	transferServer = new TransferServer( 4242 );
 	if ( !transferServer->ok() ) {
 		delete transferServer;
 		transferServer = 0;
 	}
 	if ( !transferServer || !qcopBridge )
 		startTimer( 2000 );
 }
 
 void Desktop::timerEvent( QTimerEvent *e )
 {
 	killTimer( e->timerId() );
 	startTransferServer();
 }
 
 void Desktop::terminateServers()
 {
 	delete transferServer;
 	delete qcopBridge;
 	transferServer = 0;
 	qcopBridge = 0;
 }
 
 void DesktopApplication::rereadVolumes()
 {
 	Config cfg( "qpe" );
 	cfg. setGroup ( "Volume" );
 	
 	m_screentap_sound = cfg. readBoolEntry ( "TouchSound" );
 	m_keyclick_sound  = cfg. readBoolEntry ( "KeySound" );
 	m_alarm_sound     = cfg. readBoolEntry ( "AlarmSound" );
 }
 
 void DesktopApplication::soundAlarm()
 {
 	if ( me ( )-> m_alarm_sound )
 		ODevice::inst ( )-> alarmSound ( );
 }
 
 DesktopApplication *DesktopApplication::me ( )
 {
 	return (DesktopApplication *) qApp;
 }