| -rw-r--r-- | core/opiealarm/opiealarm.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/core/opiealarm/opiealarm.c b/core/opiealarm/opiealarm.c index 422865c..b948ef2 100644 --- a/core/opiealarm/opiealarm.c +++ b/core/opiealarm/opiealarm.c @@ -322,63 +322,63 @@ int onac ( void ) if ( fscanf ( fp, "%*[^ ] %*d.%*d 0x%*x 0x%x 0x%*x 0x%*x %*d%% %*i %*c", &ac ) == 1 ) on = ( ac == 0x01 ) ? 1 : 0; fclose ( fp ); } return on; } int resume ( int resuspend ) { FILE *fp; // re-suspend when on AC (optional) when woken up via RTC if ( !opiealarm_was_running ) { // if opiealarm -s didn't wake up via RTC, the old process gets killed // by kill_by_pidfile(), which is recorded in opiealarm_was_running if ( resuspend && onac ( )) { time_t start, now; char *argv [4]; if ( !fork_with_pidfile ( )) return 4; // we can't wait for the resuspend timeout in the parent process. // so we fork and tell the parent it can exit immediatly kill ( parent_pid, SIGUSR1 ); // sleep <resuspend> seconds - this method is much more precise than sleep() ! time ( &start ); do { sleep ( 1 ); time ( &now ); } while (( now - start ) < resuspend ); if ( onac ( )) { // still on ac ? argv[0] = "qcop"; argv[1] = "QPE/Desktop"; argv[2] = "suspend()"; argv[3] = 0; // hard coded for now ...but needed // another way would be to simulate a power-button press setenv ( "LOGNAME", "root", 1 ); setenv ( "HOME", "/root", 1 ); - setenv ( "LD_LIBRARY_PATH", "/opt/QtPalmtop/lib", 1 ); - setenv ( "QTDIR", "/opt/QtPalmtop", 1 ); + setenv ( "LD_LIBRARY_PATH", OPIE_LIBDIR, 1 ); + setenv ( "QTDIR", OPIE_QTDIR, 1 ); remove_pidfile ( ); // no need for system() since this process is no longer useful anyway - execv ( "/opt/QtPalmtop/bin/qcop", argv ); + execv ( OPIE_BINDIR "/qcop", argv ); perror ( "exec for qcop failed" ); return 5; } } } return 0; } |