-rw-r--r-- | core/launcher/serverapp.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/core/launcher/serverapp.cpp b/core/launcher/serverapp.cpp index dc1f2c7..e541d10 100644 --- a/core/launcher/serverapp.cpp +++ b/core/launcher/serverapp.cpp | |||
@@ -465,97 +465,98 @@ void ServerApplication::systemMessage( const QCString& msg, | |||
465 | } | 465 | } |
466 | } | 466 | } |
467 | } | 467 | } |
468 | 468 | ||
469 | void ServerApplication::reloadPowerWarnSettings ( ) | 469 | void ServerApplication::reloadPowerWarnSettings ( ) |
470 | { | 470 | { |
471 | Config cfg ( "apm" ); | 471 | Config cfg ( "apm" ); |
472 | cfg. setGroup ( "Warnings" ); | 472 | cfg. setGroup ( "Warnings" ); |
473 | 473 | ||
474 | int iv = cfg. readNumEntry ( "checkinterval", 10000 ); | 474 | int iv = cfg. readNumEntry ( "checkinterval", 10000 ); |
475 | 475 | ||
476 | m_apm_timer-> stop ( ); | 476 | m_apm_timer-> stop ( ); |
477 | if ( iv ) | 477 | if ( iv ) |
478 | m_apm_timer-> start ( iv ); | 478 | m_apm_timer-> start ( iv ); |
479 | 479 | ||
480 | m_powerVeryLow = cfg. readNumEntry ( "powerverylow", 10 ); | 480 | m_powerVeryLow = cfg. readNumEntry ( "powerverylow", 10 ); |
481 | m_powerCritical = cfg. readNumEntry ( "powervcritical", 5 ); | 481 | m_powerCritical = cfg. readNumEntry ( "powervcritical", 5 ); |
482 | } | 482 | } |
483 | 483 | ||
484 | void ServerApplication::launcherMessage( const QCString & msg, const QByteArray & data ) | 484 | void ServerApplication::launcherMessage( const QCString & msg, const QByteArray & data ) |
485 | { | 485 | { |
486 | QDataStream stream ( data, IO_ReadOnly ); | 486 | QDataStream stream ( data, IO_ReadOnly ); |
487 | 487 | ||
488 | if ( msg == "deviceButton(int,int,int)" ) { | 488 | if ( msg == "deviceButton(int,int,int)" ) { |
489 | int keycode, press, autoRepeat; | 489 | int keycode, press, autoRepeat; |
490 | stream >> keycode >> press >> autoRepeat; | 490 | stream >> keycode >> press >> autoRepeat; |
491 | 491 | ||
492 | kf->checkButtonAction ( true, keycode, press, autoRepeat ); | 492 | kf->checkButtonAction ( true, keycode, press, autoRepeat ); |
493 | } | 493 | } |
494 | else if ( msg == "keyRegister(int,QCString,QCString)" ) { | 494 | else if ( msg == "keyRegister(int,QCString,QCString)" ) { |
495 | int k; | 495 | int k; |
496 | QCString c, m; | 496 | QCString c, m; |
497 | stream >> k >> c >> m; | 497 | stream >> k >> c >> m; |
498 | 498 | ||
499 | kf -> registerKey( QCopKeyRegister(k, c, m) ); | 499 | kf -> registerKey( QCopKeyRegister(k, c, m) ); |
500 | } | 500 | } |
501 | } | 501 | } |
502 | 502 | ||
503 | 503 | ||
504 | bool ServerApplication::screenLocked() | 504 | bool ServerApplication::screenLocked() |
505 | { | 505 | { |
506 | return loggedin == 0; | 506 | return loggedin == 0; |
507 | } | 507 | } |
508 | 508 | ||
509 | void ServerApplication::login(bool at_poweron) | 509 | void ServerApplication::login(bool at_poweron) |
510 | { | 510 | { |
511 | if ( !loggedin ) { | 511 | if ( !loggedin ) { |
512 | Global::terminateBuiltin("calibrate"); // No tr | 512 | Global::terminateBuiltin("calibrate"); // No tr |
513 | Opie::Security::MultiauthPassword::authenticate(at_poweron); | 513 | int lockMode = at_poweron ? Opie::Security::IfPowerOn : Opie::Security::IfResume; |
514 | Opie::Security::MultiauthPassword::authenticate(lockMode); | ||
514 | loggedin=1; | 515 | loggedin=1; |
515 | #ifndef QT_NO_COP | 516 | #ifndef QT_NO_COP |
516 | QCopEnvelope e( "QPE/Desktop", "unlocked()" ); | 517 | QCopEnvelope e( "QPE/Desktop", "unlocked()" ); |
517 | #endif | 518 | #endif |
518 | } | 519 | } |
519 | } | 520 | } |
520 | 521 | ||
521 | #if defined(QPE_HAVE_TOGGLELIGHT) | 522 | #if defined(QPE_HAVE_TOGGLELIGHT) |
522 | #include <qtopia/config.h> | 523 | #include <qtopia/config.h> |
523 | 524 | ||
524 | #include <sys/ioctl.h> | 525 | #include <sys/ioctl.h> |
525 | #include <sys/types.h> | 526 | #include <sys/types.h> |
526 | #include <fcntl.h> | 527 | #include <fcntl.h> |
527 | #include <unistd.h> | 528 | #include <unistd.h> |
528 | #include <errno.h> | 529 | #include <errno.h> |
529 | #include <linux/ioctl.h> | 530 | #include <linux/ioctl.h> |
530 | #include <time.h> | 531 | #include <time.h> |
531 | #endif | 532 | #endif |
532 | 533 | ||
533 | namespace { | 534 | namespace { |
534 | void execAutoStart(const QDateTime& suspendTime ) { | 535 | void execAutoStart(const QDateTime& suspendTime ) { |
535 | QString appName; | 536 | QString appName; |
536 | int delay; | 537 | int delay; |
537 | QDateTime now = QDateTime::currentDateTime(); | 538 | QDateTime now = QDateTime::currentDateTime(); |
538 | 539 | ||
539 | Config cfg( "autostart" ); | 540 | Config cfg( "autostart" ); |
540 | cfg.setGroup( "AutoStart" ); | 541 | cfg.setGroup( "AutoStart" ); |
541 | appName = cfg.readEntry( "Apps", "" ); | 542 | appName = cfg.readEntry( "Apps", "" ); |
542 | delay = cfg.readNumEntry( "Delay", 0 ); | 543 | delay = cfg.readNumEntry( "Delay", 0 ); |
543 | 544 | ||
544 | // If the time between suspend and resume was longer then the | 545 | // If the time between suspend and resume was longer then the |
545 | // value saved as delay, start the app | 546 | // value saved as delay, start the app |
546 | if ( suspendTime.secsTo( now ) >= ( delay * 60 ) && !appName.isEmpty() ) { | 547 | if ( suspendTime.secsTo( now ) >= ( delay * 60 ) && !appName.isEmpty() ) { |
547 | QCopEnvelope e( "QPE/System", "execute(QString)" ); | 548 | QCopEnvelope e( "QPE/System", "execute(QString)" ); |
548 | e << QString( appName ); | 549 | e << QString( appName ); |
549 | } | 550 | } |
550 | } | 551 | } |
551 | } | 552 | } |
552 | 553 | ||
553 | 554 | ||
554 | void ServerApplication::togglePower() | 555 | void ServerApplication::togglePower() |
555 | { | 556 | { |
556 | static bool excllock = false; | 557 | static bool excllock = false; |
557 | 558 | ||
558 | if ( excllock ) | 559 | if ( excllock ) |
559 | return ; | 560 | return ; |
560 | 561 | ||
561 | excllock = true; | 562 | excllock = true; |