Fix double suspend on key input

ServerApp proxied the power() signal from KeyFilter and we've
connected togglePower() twice to it. We only need to connect
to the ServerApp power signal and not to keyfilter because we emit
power() from ServerApp on QCOP

1 files changed, 1 insertions, 1 deletions

diff --git a/core/launcher/serverapp.cpp b/core/launcher/serverapp.cpp
index 28316a4..69e083d 100644
--- a/core/launcher/serverapp.cpp
+++ b/core/launcher/serverapp.cpp
@@ -144,385 +144,385 @@ KeyFilter::KeyFilter(QObject* parent) : QObject(parent), held_tid(0), heldButton
 
 void KeyFilter::timerEvent(QTimerEvent* e)
 {
     if ( e->timerId() == held_tid ) {
 	killTimer(held_tid);
 	// button held
 	if ( heldButton ) {
 	    emit activate(heldButton, TRUE);
 	    heldButton = 0;
 	}
 	held_tid = 0;
     }
 }
 
 void KeyFilter::registerKey( const QCopKeyRegister& key ) {
     m_keys.insert( key.keyCode(), key );
 }
 
 void KeyFilter::unregisterKey( const QCopKeyRegister& key ) {
     m_keys.remove( key.keyCode() );
 }
 
 bool KeyFilter::keyRegistered( int key ) {
     /*
      * Check if we've a key registered
      */
     if ( !m_keys[key].send())
         return false;
     else
         return true;
 
 }
 
 bool KeyFilter::checkButtonAction(bool db, int keycode,  int press, int autoRepeat)
 {
     if ( !loggedin
 	    // Permitted keys
 	    && keycode != Key_F34 // power
 	    && keycode != Key_F30 // select
 	    && keycode != Key_Enter
 	    && keycode != Key_Return
 	    && keycode != Key_Space
 	    && keycode != Key_Left
 	    && keycode != Key_Right
 	    && keycode != Key_Up
 	    && keycode != Key_Down )
 	return TRUE;
 
         /* check if it was registered */
     if (!db ) {
         if (keycode != 0 &&press && !autoRepeat && keyRegistered(keycode) )
             return true;
     }else {
 
 
         // First check to see if DeviceButtonManager knows something about this button:
         const Opie::ODeviceButton* button = Opie::ODevice::inst()->buttonForKeycode(keycode);
         if (button && !autoRepeat) {
             if ( held_tid ) {
                 killTimer(held_tid);
                 held_tid = 0;
             }
             if ( button->heldAction().isNull() ) {
                 if ( press )
                     emit activate(button, FALSE);
             } else if ( press ) {
                 heldButton = button;
                 held_tid = startTimer( ODevice::inst ()->buttonHoldTime () );
             } else if ( heldButton ) {
                 heldButton = 0;
                 emit activate(button, FALSE);
             }
             QWSServer::screenSaverActivate(FALSE);
             return TRUE;
         }
         return false;
     }
     if ( keycode == HardKey_Suspend ) {
         if ( press ) emit power();
         return TRUE;
     }
     if ( keycode == HardKey_Backlight ) {
         if ( press ) emit backlight();
         return TRUE;
     }
     if ( keycode == Key_F32 ) {
 #ifndef QT_NO_COP
         if ( press ) QCopEnvelope e( "QPE/Desktop", "startSync()" );
 #endif
         return TRUE;
     }
     if ( keycode == Key_F31 ) {
         if ( press ) emit symbol();
         QWSServer::screenSaverActivate(FALSE);
         return TRUE;
     }
 
     if ( keycode == Key_NumLock )
         if ( press ) emit numLockStateToggle();
 
     if ( keycode == Key_CapsLock )
         if ( press ) emit capsLockStateToggle();
 
     if ( serverApp )
         serverApp->keyClick(keycode,press,autoRepeat);
 
     return FALSE;
 }
 
 enum MemState { MemUnknown, MemVeryLow, MemLow, MemNormal } memstate=MemUnknown;
 
 #if defined(QPE_HAVE_MEMALERTER)
 QPE_MEMALERTER_IMPL
 #endif
 
 
 
 //---------------------------------------------------------------------------
 
 bool ServerApplication::doRestart = FALSE;
 bool ServerApplication::allowRestart = TRUE;
 
 void ServerApplication::switchLCD( bool on ) {
     if ( !qApp )
         return;
 
     ServerApplication *dapp = ServerApplication::me() ;
 
     if ( !dapp-> m_screensaver )
         return;
 
     if ( on ) {
         dapp-> m_screensaver-> setDisplayState ( true );
         dapp-> m_screensaver-> setBacklight ( -3 );
     }else
         dapp-> m_screensaver-> setDisplayState ( false );
 
 
 }
 
 ServerApplication::ServerApplication( int& argc, char **argv, Type t )
     : QPEApplication( argc, argv, t )
 {
 
 
     // We know we'll have lots of cached pixmaps due to App/DocLnks
     QPixmapCache::setCacheLimit(512);
 
     m_ps = new PowerStatus;
     m_ps_last = new PowerStatus;
     pa = new DesktopPowerAlerter( 0 );
 
     m_apm_timer = new QTimer( this );
     connect(m_apm_timer, SIGNAL( timeout() ),
             this, SLOT( apmTimeout() ) );
 
     reloadPowerWarnSettings();
 
     QCopChannel *channel = new QCopChannel( "QPE/System", this );
     connect(channel, SIGNAL(received( const QCString&, const QByteArray& ) ),
             this, SLOT(systemMessage(const QCString&, const QByteArray& ) ) );
 
     channel = new QCopChannel("QPE/Launcher", this );
     connect(channel, SIGNAL(received( const QCString&, const QByteArray& ) ),
             this, SLOT(launcherMessage( const QCString&, const QByteArray& ) ) );
 
     m_screensaver = new OpieScreenSaver();
     m_screensaver->setInterval( -1 );
     QWSServer::setScreenSaver( m_screensaver );
 
     connect( qApp, SIGNAL( volumeChanged( bool ) ),
              this, SLOT( rereadVolumes() ) );
 
 
     /* ### PluginLoader libqtopia SafeMode */
 #if 0
     if ( PluginLoader::inSafeMode() )
 	QTimer::singleShot(500, this, SLOT(showSafeMode()) );
     QTimer::singleShot(20*1000, this, SLOT(clearSafeMode()) );
 #endif
 
     kf = new KeyFilter(this);
 
     connect( kf, SIGNAL(launch()), this, SIGNAL(launch()) );
     connect( kf, SIGNAL(power()), this, SIGNAL(power()) );
     connect( kf, SIGNAL(backlight()), this, SIGNAL(backlight()) );
     connect( kf, SIGNAL(symbol()), this, SIGNAL(symbol()));
     connect( kf, SIGNAL(numLockStateToggle()), this,SIGNAL(numLockStateToggle()));
     connect( kf, SIGNAL(capsLockStateToggle()), this,SIGNAL(capsLockStateToggle()));
     connect( kf, SIGNAL(activate(const Opie::ODeviceButton*,bool)),
 	    this,SIGNAL(activate(const Opie::ODeviceButton*,bool)));
 
-    connect( kf, SIGNAL(power()), this, SLOT(togglePower()) );
+
     connect( kf, SIGNAL(backlight()), this, SLOT(toggleLight()) );
 
     connect( this, SIGNAL(power() ),
              SLOT(togglePower() ) );
 
     rereadVolumes();
 
     serverApp = this;
 
     apmTimeout();
     grabKeyboard();
 
     /* make sure the event filter is installed */
     const Opie::ODeviceButton* but = Opie::ODevice::inst()->buttonForKeycode( -1 );
 }
 
 
 ServerApplication::~ServerApplication()
 {
     ungrabKeyboard();
 
 
     delete pa;
     delete m_ps;
     delete m_ps_last;
 }
 
 void ServerApplication::apmTimeout() {
     serverApp-> checkMemory( ); // in case no events are generated
     *m_ps_last = *m_ps;
     *m_ps = PowerStatusManager::readStatus();
 
     if ( m_ps->acStatus() != m_ps_last-> acStatus() )
         m_screensaver-> powerStatusChanged( *m_ps );
 
     if ( m_ps->acStatus() == PowerStatus::Online )
         return;
 
     int bat = m_ps-> batteryPercentRemaining();
 
     if ( bat < m_ps_last-> batteryPercentRemaining() ) {
         if ( bat <= m_powerCritical )
             pa->alert( tr( "Battery level is critical!\nKeep power off until power restored!" ), 1 );
         else if ( bat <= m_powerVeryLow )
             pa->alert( tr( "Battery is running very low. "), 2 );
     }
     if ( m_ps-> backupBatteryStatus() == PowerStatus::VeryLow )
         pa->alert( tr("The Back-up battery is very low.\nPlease charge the back-up battery." ), 2);
 
 }
 
 void ServerApplication::systemMessage( const QCString& msg,
                                        const QByteArray& data ) {
     QDataStream stream ( data, IO_ReadOnly );
 
     if ( msg == "setScreenSaverInterval(int)" ) {
         int time;
         stream >> time;
         m_screensaver-> setInterval( time );
     }
     else if ( msg == "setScreenSaverIntervals(int,int,int)" ) {
         int t1, t2, t3;
         stream >> t1 >> t2 >> t3;
         m_screensaver-> setIntervals( t1, t2, t3 );
     }
     else if ( msg == "setBacklight(int)" ) {
         int bright;
         stream >> bright;
         m_screensaver-> setBacklight( bright );
     }
     else if ( msg == "setScreenSaverMode(int)" ) {
         int mode;
         stream >> mode;
         m_screensaver-> setMode ( mode );
     }
     else if ( msg == "reloadPowerWarnSettings()" ) {
         reloadPowerWarnSettings();
     }
     else if ( msg == "setDisplayState(int)" ) {
         int state;
         stream >> state;
         m_screensaver-> setDisplayState ( state != 0 );
     }
     else if ( msg == "suspend()" ) {
         emit power();
     }
     else if ( msg == "sendBusinessCard()" ) {
         QString card = ::getenv ( "HOME" );
         card += "/Applications/addressbook/businesscard.vcf";
 
         if ( QFile::exists( card ) ) {
             QCopEnvelope e ( "QPE/Obex", "send(QString,QString,QString)" );
             QString mimetype = "text/x-vCard";
             e << tr( "business card" ) << card << mimetype;
         }
     }
 }
 
 void ServerApplication::reloadPowerWarnSettings ( )
 {
     Config cfg ( "apm" );
     cfg. setGroup ( "Warnings" );
 
     int iv = cfg. readNumEntry ( "checkinterval", 10000 );
 
     m_apm_timer-> stop ( );
     if ( iv )
         m_apm_timer-> start ( iv );
 
     m_powerVeryLow  = cfg. readNumEntry ( "powerverylow", 10 );
     m_powerCritical = cfg. readNumEntry ( "powervcritical", 5 );
 }
 
 void ServerApplication::launcherMessage( const QCString & msg, const QByteArray & data )
 {
     QDataStream stream ( data, IO_ReadOnly );
 
     if ( msg == "deviceButton(int,int,int)" ) {
         int keycode, press, autoRepeat;
         stream >> keycode >> press >> autoRepeat;
 
         kf->checkButtonAction ( true, keycode, press, autoRepeat );
     }
     else if ( msg == "keyRegister(int,QCString,QCString)" ) {
         int k;
         QCString c, m;
         stream >> k >> c >> m;
 
         kf -> registerKey( QCopKeyRegister(k, c, m) );
     }
 }
 
 
 bool ServerApplication::screenLocked()
 {
     return loggedin == 0;
 }
 
 void ServerApplication::login(bool at_poweron)
 {
     if ( !loggedin ) {
 	Global::terminateBuiltin("calibrate"); // No tr
 	Password::authenticate(at_poweron);
 	loggedin=1;
 #ifndef QT_NO_COP
 	QCopEnvelope e( "QPE/Desktop", "unlocked()" );
 #endif
     }
 }
 
 #if defined(QPE_HAVE_TOGGLELIGHT)
 #include <qtopia/config.h>
 
 #include <sys/ioctl.h>
 #include <sys/types.h>
 #include <fcntl.h>
 #include <unistd.h>
 #include <errno.h>
 #include <linux/ioctl.h>
 #include <time.h>
 #endif
 
 #if 0
 static bool blanked=FALSE;
 
 static void blankScreen()
 {
 #ifdef QWS
     QWidget w(0, 0, Qt::WStyle_Customize | Qt::WStyle_NoBorder | Qt::WStyle_Tool | Qt::WStyle_StaysOnTop | Qt::WPaintUnclipped);
     w.resize( qt_screen->width(), qt_screen->height() );
     w.move(0, 0);
 
     QPainter p(&w);
     p.fillRect(w.rect(), QBrush(QColor(255,255,255)) );
     p.end();
     w.repaint();
 
     blanked = TRUE;
 #endif
 }
 
 static void darkScreen()
 {
     /* ### Screen blanking ODevice */
 #if 0
     qpe_setBacklight(0); // force off
 #endif
 }
 #endif
 
 namespace {
     void execAutoStart(const QDateTime& suspendTime ) {