-rw-r--r-- | core/launcher/desktop.cpp | 6 |
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 | |||
@@ -735,29 +735,29 @@ void DesktopApplication::shutdown() | |||
735 | ShutdownImpl *sd = new ShutdownImpl( 0, 0, WDestructiveClose ); | 735 | ShutdownImpl *sd = new ShutdownImpl( 0, 0, WDestructiveClose ); |
736 | connect( sd, SIGNAL( shutdown( ShutdownImpl::Type ) ), | 736 | connect( sd, SIGNAL( shutdown( ShutdownImpl::Type ) ), |
737 | this, SLOT( shutdown( ShutdownImpl::Type ) ) ); | 737 | this, SLOT( shutdown( ShutdownImpl::Type ) ) ); |
738 | sd->showMaximized(); | 738 | sd->showMaximized(); |
739 | } | 739 | } |
740 | 740 | ||
741 | void DesktopApplication::shutdown( ShutdownImpl::Type t ) | 741 | void DesktopApplication::shutdown( ShutdownImpl::Type t ) |
742 | { | 742 | { |
743 | char *path[] = { "/sbin", "/usr/sbin", 0 }; | ||
744 | char *opt = 0; | 743 | char *opt = 0; |
745 | 744 | ||
746 | switch ( t ) { | 745 | switch ( t ) { |
747 | case ShutdownImpl::ShutdownSystem: | 746 | case ShutdownImpl::ShutdownSystem: |
748 | opt = "-h"; | 747 | opt = "-h"; |
749 | // fall through | 748 | // fall through |
750 | case ShutdownImpl::RebootSystem: | 749 | case ShutdownImpl::RebootSystem: |
751 | if ( opt == 0 ) | 750 | if ( opt == 0 ) |
752 | opt = "-r"; | 751 | opt = "-r"; |
753 | 752 | ||
754 | if ( execle( "shutdown", "shutdown", opt, "now", ( void* ) 0, path ) < 0 ) | 753 | if ( execl( "/sbin/shutdown", "shutdown", opt, "now", ( void* ) 0) < 0 ) |
755 | ::syslog ( LOG_ERR, "Erroring execing shutdown\n" ); | 754 | perror("shutdown"); |
755 | // ::syslog ( LOG_ERR, "Erroring execing shutdown\n" ); | ||
756 | 756 | ||
757 | break; | 757 | break; |
758 | case ShutdownImpl::RestartDesktop: | 758 | case ShutdownImpl::RestartDesktop: |
759 | restart(); | 759 | restart(); |
760 | break; | 760 | break; |
761 | case ShutdownImpl::TerminateDesktop: | 761 | case ShutdownImpl::TerminateDesktop: |
762 | prepareForTermination( FALSE ); | 762 | prepareForTermination( FALSE ); |
763 | 763 | ||