summaryrefslogtreecommitdiff
authorkergoth <kergoth>2003-03-14 20:40:06 (UTC)
committer kergoth <kergoth>2003-03-14 20:40:06 (UTC)
commit2c53d85583ebece42b3b4c155540cd6a01542731 (patch) (side-by-side diff)
treee30be18a7d98d9ebee5ac4a30bbe703b3a34cc28
parent2d20b81186bd9a4795af736710d0cb205ead9a77 (diff)
downloadopie-2c53d85583ebece42b3b4c155540cd6a01542731.zip
opie-2c53d85583ebece42b3b4c155540cd6a01542731.tar.gz
opie-2c53d85583ebece42b3b4c155540cd6a01542731.tar.bz2
Simplification.
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--core/launcher/desktop.cpp6
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
@@ -727,45 +727,45 @@ void Desktop::styleChange( QStyle &s )
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;
}