summaryrefslogtreecommitdiff
authorMichael Krelin <hacker@klever.net>2007-07-07 18:39:41 (UTC)
committer Michael Krelin <hacker@klever.net>2007-07-16 11:43:49 (UTC)
commite2d6af387dc3f91e920a867e948d1255710f3604 (patch) (unidiff)
tree78c43da8e5d0586485f9872f834f08f372eccdd5
parent2b97142421c04098b72021b0526873a54ba951d7 (diff)
downloadopie-e2d6af387dc3f91e920a867e948d1255710f3604.zip
opie-e2d6af387dc3f91e920a867e948d1255710f3604.tar.gz
opie-e2d6af387dc3f91e920a867e948d1255710f3604.tar.bz2
launcher: restart opie from OPIE_BINDIR
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/launcher/serverapp.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/core/launcher/serverapp.cpp b/core/launcher/serverapp.cpp
index 0e92040..b933340 100644
--- a/core/launcher/serverapp.cpp
+++ b/core/launcher/serverapp.cpp
@@ -754,24 +754,25 @@ void ServerApplication::restart()
754 */ 754 */
755#ifdef ALL_APPLETS_ON_THIS_WORLD_ARE_FIXED 755#ifdef ALL_APPLETS_ON_THIS_WORLD_ARE_FIXED
756 /* same as above */ 756 /* same as above */
757 emit aboutToQuit(); 757 emit aboutToQuit();
758 prepareForTermination(TRUE); 758 prepareForTermination(TRUE);
759 doRestart = TRUE; 759 doRestart = TRUE;
760 quit(); 760 quit();
761#else 761#else
762 prepareForTermination( true ); 762 prepareForTermination( true );
763 for ( int fd = 3; fd < 100; fd++ ) 763 for ( int fd = 3; fd < 100; fd++ )
764 close( fd ); 764 close( fd );
765 execl( ( qpeDir() + "/bin/qpe" ).local8Bit(), "qpe", NULL ); 765 execl( ( qpeDir() + "/bin/qpe" ).local8Bit(), "qpe", NULL );
766 execl( OPIE_BINDIR "/qpe", "qpe", NULL );
766 exit( 1 ); 767 exit( 1 );
767#endif 768#endif
768 } 769 }
769} 770}
770 771
771void ServerApplication::rereadVolumes() 772void ServerApplication::rereadVolumes()
772{ 773{
773 Config cfg( "qpe" ); 774 Config cfg( "qpe" );
774 cfg. setGroup ( "Volume" ); 775 cfg. setGroup ( "Volume" );
775 776
776 m_screentap_sound = cfg. readBoolEntry ( "TouchSound" ); 777 m_screentap_sound = cfg. readBoolEntry ( "TouchSound" );
777 m_keyclick_sound = cfg. readBoolEntry ( "KeySound" ); 778 m_keyclick_sound = cfg. readBoolEntry ( "KeySound" );