Fixed the "can't suspend 38xx's anymore by pressing power" bug -- I forgot

to remove a break, when I moved the keyfilter code from the launcher to
ODevice

1 files changed, 2 insertions, 2 deletions

diff --git a/libopie/odevice.cpp b/libopie/odevice.cpp
index 75426f9..80e9a91 100644
--- a/libopie/odevice.cpp
+++ b/libopie/odevice.cpp
@@ -483,116 +483,116 @@ bool iPAQ::setLedState ( OLed l, OLedState st )
                         leds. OffTime    = 1;
                         leds. OffOnBlink = 2;
 
                         switch ( st ) {
                                 case Led_Off      : leds. OffOnBlink = 0; break;
                                 case Led_On       : leds. OffOnBlink = 1; break;
                                 case Led_BlinkSlow: leds. OnTime = 10; leds. OffTime = 10; break;
                                 case Led_BlinkFast: leds. OnTime =  5; leds. OffTime =  5; break;
                         }
 
                         if ( ::ioctl ( fd, LED_ON, &leds ) >= 0 ) {
                                 m_leds [0] = st;
                                 return true;
                         }
                 }
         }
         return false;
 }
 
 
 //QValueList <int> iPAQ::keyList ( ) const
 //{
         //QValueList <int> vl;
         //vl << HardKey_Datebook << HardKey_Contacts << ( model ( ) == Model_iPAQ_H38xx ? HardKey_Mail : HardKey_Menu ) << HardKey_Home << HardKey_Record << HardKey_Suspend << HardKey_Backlight;
         //return vl;
 //}
 
 bool iPAQ::filter ( int /*unicode*/, int keycode, int modifiers, bool isPress, bool autoRepeat )
 {
         int newkeycode = keycode;
 
         
         // simple susbstitutions
         switch ( d-> m_model ) {
                 case Model_iPAQ_H38xx:
                         // H38xx has no "Q" key anymore - this is now the Mail key
                         if ( keycode == HardKey_Menu )
                                 newkeycode = HardKey_Mail;
                         //nobreak
                                                 
                 case Model_iPAQ_H31xx: 
                         // Rotate cursor keys 180°
                         switch ( keycode ) {
                                 case Key_Left : newkeycode = Key_Right; break;
                                 case Key_Right: newkeycode = Key_Left; break;
                                 case Key_Up   : newkeycode = Key_Down; break;
                                 case Key_Down : newkeycode = Key_Up; break;
                         }
-                        break;
+                        //nobreak;
 
                 case Model_iPAQ_H36xx: 
                 case Model_iPAQ_H37xx: 
                         // map Power Button short/long press to F34/F35
                         if ( keycode == Key_SysReq ) {
                                 if ( isPress ) {
                                         if ( m_power_timer )
                                                 killTimer ( m_power_timer );
                                         m_power_timer = startTimer ( 500 );
                                 }
                                 else if ( m_power_timer ) {
                                         killTimer ( m_power_timer );
                                         m_power_timer = 0;
                                         QWSServer::sendKeyEvent ( -1, HardKey_Suspend, 0, true, false );
                                         QWSServer::sendKeyEvent ( -1, HardKey_Suspend, 0, false, false );
                                 }
                                         newkeycode = Key_unknown;               
                         }
-                        break;
+                        //nobreak;
                 
                 default: 
                         break;
                 }                       
 
         if ( newkeycode != keycode ) {
                 if ( newkeycode != Key_unknown )
                         QWSServer::sendKeyEvent ( -1, newkeycode, modifiers, isPress, autoRepeat );
                 return true;
         }
         else
                 return false;
 }
 
 void iPAQ::timerEvent ( QTimerEvent * )
 {
         killTimer ( m_power_timer );
         m_power_timer = 0;
         QWSServer::sendKeyEvent ( -1, HardKey_Backlight, 0, true, false );
         QWSServer::sendKeyEvent ( -1, HardKey_Backlight, 0, false, false );
 }
 
 
 void iPAQ::alarmSound ( )
 {
 #if defined( QT_QWS_IPAQ ) // IPAQ
 #ifndef QT_NO_SOUND
         static Sound snd ( "alarm" );
         int fd;
         int vol;
         bool vol_reset = false;
 
         if ((( fd = ::open ( "/dev/sound/mixer", O_RDWR )) >= 0 ) ||
             (( fd = ::open ( "/dev/mixer", O_RDWR )) >= 0 )) {
 
                 if ( ::ioctl ( fd, MIXER_READ( 0 ), &vol ) >= 0 ) {
                         Config cfg ( "qpe" );
                         cfg. setGroup ( "Volume" );
 
                         int volalarm = cfg. readNumEntry ( "AlarmPercent", 50 );
                         if ( volalarm < 0 )
                                 volalarm = 0;
                         else if ( volalarm > 100 )
                                 volalarm = 100;
                         volalarm |= ( volalarm << 8 );
 
                         if (( volalarm & 0xff ) > ( vol & 0xff )) {
                                 if ( ::ioctl ( fd, MIXER_WRITE( 0 ), &volalarm ) >= 0 )