author | zecke <zecke> | 2004-10-17 18:34:36 (UTC) |
---|---|---|
committer | zecke <zecke> | 2004-10-17 18:34:36 (UTC) |
commit | ca65f8eba5cd7e3a2e3096b545527ced8b76e5cd (patch) (unidiff) | |
tree | 96b742d6b8f1322158cdc66a8b3f8357d73ac571 | |
parent | 8eaae40a6b9db12813be60ec7c8afe21afd4478d (diff) | |
download | opie-ca65f8eba5cd7e3a2e3096b545527ced8b76e5cd.zip opie-ca65f8eba5cd7e3a2e3096b545527ced8b76e5cd.tar.gz opie-ca65f8eba5cd7e3a2e3096b545527ced8b76e5cd.tar.bz2 |
-Use local8Bit instead of latin1
-rw-r--r-- | core/launcher/serverapp.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/launcher/serverapp.cpp b/core/launcher/serverapp.cpp index e541d10..be6b972 100644 --- a/core/launcher/serverapp.cpp +++ b/core/launcher/serverapp.cpp | |||
@@ -705,97 +705,97 @@ void ServerApplication::shutdown( ShutdownImpl::Type t ) | |||
705 | // fall through | 705 | // fall through |
706 | case ShutdownImpl::RebootSystem: | 706 | case ShutdownImpl::RebootSystem: |
707 | if ( opt == 0 ) | 707 | if ( opt == 0 ) |
708 | opt = "-r"; | 708 | opt = "-r"; |
709 | 709 | ||
710 | if ( execl( "/sbin/shutdown", "shutdown", opt, "now", ( void* ) 0) < 0 ) | 710 | if ( execl( "/sbin/shutdown", "shutdown", opt, "now", ( void* ) 0) < 0 ) |
711 | perror("shutdown"); | 711 | perror("shutdown"); |
712 | // ::syslog ( LOG_ERR, "Erroring execing shutdown\n" ); | 712 | // ::syslog ( LOG_ERR, "Erroring execing shutdown\n" ); |
713 | 713 | ||
714 | break; | 714 | break; |
715 | case ShutdownImpl::RestartDesktop: | 715 | case ShutdownImpl::RestartDesktop: |
716 | restart(); | 716 | restart(); |
717 | break; | 717 | break; |
718 | case ShutdownImpl::TerminateDesktop: | 718 | case ShutdownImpl::TerminateDesktop: |
719 | prepareForTermination( FALSE ); | 719 | prepareForTermination( FALSE ); |
720 | 720 | ||
721 | // This is a workaround for a Qt bug | 721 | // This is a workaround for a Qt bug |
722 | // clipboard applet has to stop its poll timer, or Qt/E | 722 | // clipboard applet has to stop its poll timer, or Qt/E |
723 | // will hang on quit() right before it emits aboutToQuit() | 723 | // will hang on quit() right before it emits aboutToQuit() |
724 | emit aboutToQuit ( ); | 724 | emit aboutToQuit ( ); |
725 | 725 | ||
726 | quit(); | 726 | quit(); |
727 | break; | 727 | break; |
728 | } | 728 | } |
729 | } | 729 | } |
730 | 730 | ||
731 | void ServerApplication::restart() | 731 | void ServerApplication::restart() |
732 | { | 732 | { |
733 | if ( allowRestart ) { | 733 | if ( allowRestart ) { |
734 | 734 | ||
735 | /* | 735 | /* |
736 | * Applets and restart is a problem. Some applets delete | 736 | * Applets and restart is a problem. Some applets delete |
737 | * their widgets even if ownership gets transfered to the | 737 | * their widgets even if ownership gets transfered to the |
738 | * parent (Systray ) but deleting the applet may be unsafe | 738 | * parent (Systray ) but deleting the applet may be unsafe |
739 | * as well ( double deletion ). Some have topLevel widgets | 739 | * as well ( double deletion ). Some have topLevel widgets |
740 | * and when we dlclose and then delete the widget we will | 740 | * and when we dlclose and then delete the widget we will |
741 | * crash and an crash during restart is not nice | 741 | * crash and an crash during restart is not nice |
742 | */ | 742 | */ |
743 | #ifdef ALL_APPLETS_ON_THIS_WORLD_ARE_FIXED | 743 | #ifdef ALL_APPLETS_ON_THIS_WORLD_ARE_FIXED |
744 | /* same as above */ | 744 | /* same as above */ |
745 | emit aboutToQuit(); | 745 | emit aboutToQuit(); |
746 | prepareForTermination(TRUE); | 746 | prepareForTermination(TRUE); |
747 | doRestart = TRUE; | 747 | doRestart = TRUE; |
748 | quit(); | 748 | quit(); |
749 | #else | 749 | #else |
750 | prepareForTermination( true ); | 750 | prepareForTermination( true ); |
751 | for ( int fd = 3; fd < 100; fd++ ) | 751 | for ( int fd = 3; fd < 100; fd++ ) |
752 | close( fd ); | 752 | close( fd ); |
753 | execl( ( qpeDir() + "/bin/qpe" ).latin1(), "qpe", 0 ); | 753 | execl( ( qpeDir() + "/bin/qpe" ).local8Bit(), "qpe", NULL ); |
754 | exit( 1 ); | 754 | exit( 1 ); |
755 | #endif | 755 | #endif |
756 | } | 756 | } |
757 | } | 757 | } |
758 | 758 | ||
759 | void ServerApplication::rereadVolumes() | 759 | void ServerApplication::rereadVolumes() |
760 | { | 760 | { |
761 | Config cfg( "qpe" ); | 761 | Config cfg( "qpe" ); |
762 | cfg. setGroup ( "Volume" ); | 762 | cfg. setGroup ( "Volume" ); |
763 | 763 | ||
764 | m_screentap_sound = cfg. readBoolEntry ( "TouchSound" ); | 764 | m_screentap_sound = cfg. readBoolEntry ( "TouchSound" ); |
765 | m_keyclick_sound = cfg. readBoolEntry ( "KeySound" ); | 765 | m_keyclick_sound = cfg. readBoolEntry ( "KeySound" ); |
766 | m_alarm_sound = cfg. readBoolEntry ( "AlarmSound" ); | 766 | m_alarm_sound = cfg. readBoolEntry ( "AlarmSound" ); |
767 | } | 767 | } |
768 | 768 | ||
769 | 769 | ||
770 | void ServerApplication::checkMemory() | 770 | void ServerApplication::checkMemory() |
771 | { | 771 | { |
772 | #if defined(QPE_HAVE_MEMALERTER) | 772 | #if defined(QPE_HAVE_MEMALERTER) |
773 | static bool ignoreNormal=TRUE; | 773 | static bool ignoreNormal=TRUE; |
774 | static bool existingMessage=FALSE; | 774 | static bool existingMessage=FALSE; |
775 | 775 | ||
776 | if(existingMessage) | 776 | if(existingMessage) |
777 | return; // don't show a second message while still on first | 777 | return; // don't show a second message while still on first |
778 | 778 | ||
779 | existingMessage = TRUE; | 779 | existingMessage = TRUE; |
780 | switch ( memstate ) { | 780 | switch ( memstate ) { |
781 | case MemUnknown: | 781 | case MemUnknown: |
782 | break; | 782 | break; |
783 | case MemLow: | 783 | case MemLow: |
784 | memstate = MemUnknown; | 784 | memstate = MemUnknown; |
785 | if ( !recoverMemory() ) { | 785 | if ( !recoverMemory() ) { |
786 | QMessageBox::warning( 0 , tr("Memory Status"), | 786 | QMessageBox::warning( 0 , tr("Memory Status"), |
787 | tr("Memory Low\nPlease save data.") ); | 787 | tr("Memory Low\nPlease save data.") ); |
788 | ignoreNormal = FALSE; | 788 | ignoreNormal = FALSE; |
789 | } | 789 | } |
790 | break; | 790 | break; |
791 | case MemNormal: | 791 | case MemNormal: |
792 | memstate = MemUnknown; | 792 | memstate = MemUnknown; |
793 | if ( !ignoreNormal ) { | 793 | if ( !ignoreNormal ) { |
794 | ignoreNormal = TRUE; | 794 | ignoreNormal = TRUE; |
795 | QMessageBox::information ( 0 , tr("Memory Status"), | 795 | QMessageBox::information ( 0 , tr("Memory Status"), |
796 | "Memory OK" ); | 796 | "Memory OK" ); |
797 | } | 797 | } |
798 | break; | 798 | break; |
799 | case MemVeryLow: | 799 | case MemVeryLow: |
800 | memstate = MemUnknown; | 800 | memstate = MemUnknown; |
801 | QMessageBox::critical( 0 , tr("Memory Status"), | 801 | QMessageBox::critical( 0 , tr("Memory Status"), |