author | llornkcor <llornkcor> | 2002-10-20 21:10:44 (UTC) |
---|---|---|
committer | llornkcor <llornkcor> | 2002-10-20 21:10:44 (UTC) |
commit | 5696ac7a408c826c1e62f2200f6209a2c3d95119 (patch) (side-by-side diff) | |
tree | 0b1f6e4b6e96331abf380ae371aa8021c6045f33 /core/applets/cardmon | |
parent | d5433091ba9741f0fae104d038b906e353065e2d (diff) | |
download | opie-5696ac7a408c826c1e62f2200f6209a2c3d95119.zip opie-5696ac7a408c826c1e62f2200f6209a2c3d95119.tar.gz opie-5696ac7a408c826c1e62f2200f6209a2c3d95119.tar.bz2 |
fix for sd/cf double whammy insert/eject on resume
-rw-r--r-- | core/applets/cardmon/cardmon.cpp | 50 |
1 files changed, 26 insertions, 24 deletions
diff --git a/core/applets/cardmon/cardmon.cpp b/core/applets/cardmon/cardmon.cpp index c0a936f..74e8837 100644 --- a/core/applets/cardmon/cardmon.cpp +++ b/core/applets/cardmon/cardmon.cpp @@ -73,16 +73,16 @@ CardMonitor::~CardMonitor() { } void CardMonitor::popUp( QString message, QString icon ) { if ( ! popupMenu ) { - popupMenu = new QPopupMenu(); + popupMenu = new QPopupMenu(); } popupMenu->clear(); if( icon.isEmpty() ) { - popupMenu->insertItem( message, 0 ); + popupMenu->insertItem( message, 0 ); } else { - popupMenu->insertItem( QIconSet ( Resource::loadPixmap ( icon ) ), message, 0 ); + popupMenu->insertItem( QIconSet ( Resource::loadPixmap ( icon ) ), message, 0 ); } QPoint p = mapToGlobal ( QPoint ( 0, 0 ) ); QSize s = popupMenu->sizeHint (); @@ -112,24 +112,24 @@ void CardMonitor::mousePressEvent( QMouseEvent * ) { } if ( cardInPcmcia1 ) { menu->insertItem( QIconSet ( Resource::loadPixmap ( "cardmon/" + cardInPcmcia1Type ) ), - tr( "Eject card 1: %1" ).arg( cardInPcmcia1Name ), 2 ); + tr( "Eject card 1: %1" ).arg( cardInPcmcia1Name ), 2 ); } QPoint p = mapToGlobal ( QPoint ( 0, 0 ) ); QSize s = menu->sizeHint (); int opt = menu->exec( QPoint ( - p. x ( ) + ( width ( ) / 2 ) - ( s. width ( ) / 2 ), - p. y ( ) - s. height ( ) ), 0); + p. x ( ) + ( width ( ) / 2 ) - ( s. width ( ) / 2 ), + p. y ( ) - s. height ( ) ), 0); if ( opt == 1 ) { cmd = "/sbin/cardctl eject 0"; - err = system( ( const char * ) cmd ); - if ( ( err == 127 ) || ( err < 0 ) ) { - qDebug( "Could not execute `/sbin/cardctl eject 0'! err=%d", err ); - popUp( tr( "CF/PCMCIA card eject failed!" ) ); - } + err = system( ( const char * ) cmd ); + if ( ( err == 127 ) || ( err < 0 ) ) { + qDebug( "Could not execute `/sbin/cardctl eject 0'! err=%d", err ); + popUp( tr( "CF/PCMCIA card eject failed!" ) ); + } } else if ( opt == 0 ) { if ( ODevice::inst()->system() == System_Familiar ) { cmd = "umount /dev/mmc/part1"; err = system( ( const char *) cmd ); @@ -146,12 +146,12 @@ void CardMonitor::mousePressEvent( QMouseEvent * ) { } } else if ( opt == 2 ) { cmd = "/sbin/cardctl eject 1"; err = system( ( const char *) cmd ); - if ( ( err == 127 ) || ( err < 0 ) ) { - qDebug( "Could not execute `/sbin/cardctl eject 1'! err=%d", err ); - popUp( tr( "CF/PCMCIA card eject failed!" ) ); - } + if ( ( err == 127 ) || ( err < 0 ) ) { + qDebug( "Could not execute `/sbin/cardctl eject 1'! err=%d", err ); + popUp( tr( "CF/PCMCIA card eject failed!" ) ); + } } delete menu; } @@ -203,10 +203,10 @@ bool CardMonitor::getStatusPcmcia( int showPopUp ) { cardInPcmcia0Name.stripWhiteSpace(); cardInPcmcia0 = TRUE; show(); line++; - int pos=(*line).find('\t' ) + 1; - cardInPcmcia0Type = (*line).mid( pos, (*line).find( "\t" , pos) - pos ); + int pos=(*line).find('\t' ) + 1; + cardInPcmcia0Type = (*line).mid( pos, (*line).find( "\t" , pos) - pos ); } } else if( (*line).startsWith( "Socket 1:" ) ){ if( (*line).startsWith( "Socket 1: empty" ) && cardInPcmcia1 ) { cardInPcmcia1 = FALSE; @@ -215,10 +215,10 @@ bool CardMonitor::getStatusPcmcia( int showPopUp ) { cardInPcmcia1Name.stripWhiteSpace(); cardInPcmcia1 = TRUE; show(); line++; - int pos=(*line).find('\t') + 1; - cardInPcmcia1Type = (*line).mid( pos, (*line).find("\t", pos) - pos ); + int pos=(*line).find('\t') + 1; + cardInPcmcia1Type = (*line).mid( pos, (*line).find("\t", pos) - pos ); } } } f.close(); @@ -234,9 +234,9 @@ bool CardMonitor::getStatusPcmcia( int showPopUp ) { text += tr( "Ejected: " ); what="off"; } text += cardInPcmcia0Name; - popUp( text, "cardmon/" + cardInPcmcia0Type ); + popUp( text, "cardmon/" + cardInPcmcia0Type ); } if( cardWas1 != cardInPcmcia1) { if( cardInPcmcia1) { @@ -245,10 +245,10 @@ bool CardMonitor::getStatusPcmcia( int showPopUp ) { } else { text += tr( "Ejected: " ); what = "off"; } - text += cardInPcmcia1Name; - popUp( text, "cardmon/" + cardInPcmcia1Type ); + text += cardInPcmcia1Name; + popUp( text, "cardmon/" + cardInPcmcia1Type ); } QSound::play( Resource::findSound( "cardmon/card" + what) ); } } else { @@ -263,8 +263,9 @@ bool CardMonitor::getStatusPcmcia( int showPopUp ) { bool CardMonitor::getStatusSd( int showPopUp ) { bool cardWas = cardInSd; // remember last state + cardInSd = FALSE; #if defined(_OS_LINUX_) || defined(Q_OS_LINUX) struct mntent *me; FILE *mntfp = setmntent( "/etc/mtab", "r" ); @@ -275,11 +276,12 @@ bool CardMonitor::getStatusSd( int showPopUp ) { //qDebug( fs ); if ( fs.left( 14 ) == "/dev/mmc/part1" || fs.left( 7 ) == "/dev/sd" || fs.left( 9 ) == "/dev/mmcd" ) { cardInSd = TRUE; show(); - } else { - cardInSd = FALSE; } +// else { +// cardInSd = FALSE; +// } } endmntent( mntfp ); } |