-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 | |||
@@ -729,49 +729,49 @@ void ServerApplication::shutdown( ShutdownImpl::Type t ) | |||
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 |