summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/applets/cardmon/cardmon.cpp6
1 files changed, 2 insertions, 4 deletions
diff --git a/core/applets/cardmon/cardmon.cpp b/core/applets/cardmon/cardmon.cpp
index 74e8837..815c993 100644
--- a/core/applets/cardmon/cardmon.cpp
+++ b/core/applets/cardmon/cardmon.cpp
@@ -114,103 +114,101 @@ void CardMonitor::mousePressEvent( QMouseEvent * ) {
if ( cardInPcmcia1 ) {
menu->insertItem( QIconSet ( Resource::loadPixmap ( "cardmon/" + cardInPcmcia1Type ) ),
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);
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!" ) );
}
} else if ( opt == 0 ) {
if ( ODevice::inst()->system() == System_Familiar ) {
cmd = "umount /dev/mmc/part1";
err = system( ( const char *) cmd );
if ( ( err != 0 ) ) {
popUp( tr("SD/MMC card eject failed!") );
}
} else {
cmd = "/etc/sdcontrol compeject";
err = system( ( const char *) cmd );
if ( ( err != 0 ) ) {
qDebug( "Could not execute `/etc/sdcontrol comeject'! err=%d", err );
popUp( tr("SD/MMC card eject failed!") );
}
}
} 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!" ) );
}
}
delete menu;
}
void CardMonitor::cardMessage( const QCString &msg, const QByteArray & ) {
if ( msg == "stabChanged()" ) {
// qDebug("Pcmcia: stabchanged");
- if ( getStatusPcmcia() ) {
- repaint( FALSE );
+ getStatusPcmcia();
}
} else if ( msg == "mtabChanged()" ) {
qDebug("CARDMONAPPLET: mtabchanged");
- if ( getStatusSd() ) {
- repaint( FALSE );
+ getStatusSd();
}
}
}
bool CardMonitor::getStatusPcmcia( int showPopUp ) {
bool cardWas0 = cardInPcmcia0; // remember last state
bool cardWas1 = cardInPcmcia1;
QString fileName;
// one of these 3 files should exist
if ( QFile::exists( "/var/run/stab" ) ) {
fileName = "/var/run/stab";
} else if (QFile::exists( "/var/state/pcmcia/stab" ) ) {
fileName = "/var/state/pcmcia/stab";
} else {
fileName = "/var/lib/pcmcia/stab";
}
QFile f( fileName );
if ( f.open( IO_ReadOnly ) ) {
QStringList list;
QTextStream stream ( &f );
QString streamIn;
streamIn = stream.read();
list = QStringList::split( "\n", streamIn );
for( QStringList::Iterator line=list.begin(); line!=list.end(); line++ ) {
if( (*line).startsWith( "Socket 0:" ) ){
if( (*line).startsWith( "Socket 0: empty" ) && cardInPcmcia0 ){
cardInPcmcia0 = FALSE;
} else if ( !(*line).startsWith( "Socket 0: empty" ) && !cardInPcmcia0 ){
cardInPcmcia0Name = (*line).mid( ( (*line).find( ':' ) + 1 ), (*line).length() - 9 );
cardInPcmcia0Name.stripWhiteSpace();
cardInPcmcia0 = TRUE;
show();
line++;
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;
} else if ( !(*line).startsWith( "Socket 1: empty" ) && !cardInPcmcia1 ) {
cardInPcmcia1Name = (*line).mid(((*line).find(':') + 1), (*line).length() - 9 );
cardInPcmcia1Name.stripWhiteSpace();
cardInPcmcia1 = TRUE;