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
@@ -138,55 +138,53 @@ void CardMonitor::mousePressEvent( QMouseEvent * ) {
}
} 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;