Simplification.

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
@@ -551,299 +551,299 @@ void Desktop::checkMemory()
                         if ( recoverMemory() )
                                 ignoreNormal = TRUE;
                         else
                                 QMessageBox::warning( 0 , "Memory Status",
                                                       "The memory smacks of shortage. \n"
                                                       "Please save data. " );
                         break;
                 case Normal:
                         memstate = Unknown;
                         if ( ignoreNormal )
                                 ignoreNormal = FALSE;
                         //       else
                         //         QMessageBox::information ( 0 , "Memory Status",
                         //                                    "There is enough memory again." );
                         break;
                 case VeryLow:
                         memstate = Unknown;
                         QMessageBox::critical( 0 , "Memory Status",
                                                "The memory is very low. \n"
                                                "Please end this application \n"
                                                "immediately." );
                         recoverMemory();
         }
         existingMessage = FALSE;
 #endif
 }
 
 static bool isVisibleWindow( int wid )
 {
 #ifdef QWS
         const QList<QWSWindow> &list = qwsServer->clientWindows();
         QWSWindow* w;
         for ( QListIterator<QWSWindow> it( list ); ( w = it.current() ); ++it ) {
                 if ( w->winId() == wid )
                         return !w->isFullyObscured();
         }
 #endif
         return FALSE;
 }
 
 static bool hasVisibleWindow( const QString& clientname )
 {
 #ifdef QWS
         const QList<QWSWindow> &list = qwsServer->clientWindows();
         QWSWindow* w;
         for ( QListIterator<QWSWindow> it( list ); ( w = it.current() ); ++it ) {
                 if ( w->client() ->identity() == clientname && !w->isFullyObscured() )
                         return TRUE;
         }
 #endif
         return FALSE;
 }
 
 
 void Desktop::executeOrModify( const QString& appLnkFile )
 {
         AppLnk lnk( MimeType::appsFolderName() + "/" + appLnkFile );
         if ( lnk.isValid() ) {
                 QCString app = lnk.exec().utf8();
                 Global::terminateBuiltin( "calibrate" );
                 if ( QCopChannel::isRegistered( "QPE/Application/" + app ) ) {
                         //  MRUList::addTask( &lnk );
                         if ( hasVisibleWindow( app ) )
                                 QCopChannel::send( "QPE/Application/" + app, "nextView()" );
                         else
                                 QCopChannel::send( "QPE/Application/" + app, "raise()" );
                 }
                 else {
                         lnk.execute();
                 }
         }
 }
 
 // autoStarts apps on resume and start
 void Desktop::execAutoStart()
 {
         QString appName;
         int delay;
         QDateTime now = QDateTime::currentDateTime();
         Config cfg( "autostart" );
         cfg.setGroup( "AutoStart" );
         appName = cfg.readEntry( "Apps", "" );
         delay = ( cfg.readEntry( "Delay", "0" ) ).toInt();
         // If the time between suspend and resume was longer then the
         // value saved as delay, start the app
         if ( suspendTime.secsTo( now ) >= ( delay * 60 ) && !appName.isEmpty() ) {
                 QCopEnvelope e( "QPE/System", "execute(QString)" );
                 e << QString( appName );
         }
 }
 
 #if defined(QPE_HAVE_TOGGLELIGHT)
 #include <qpe/config.h>
 
 #include <sys/ioctl.h>
 #include <sys/types.h>
 #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;
 }