summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--core/applets/cardmon/cardmon.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/applets/cardmon/cardmon.cpp b/core/applets/cardmon/cardmon.cpp
index 53497df..452339c 100644
--- a/core/applets/cardmon/cardmon.cpp
+++ b/core/applets/cardmon/cardmon.cpp
@@ -242,97 +242,97 @@ bool CardMonitor::getStatusPcmcia( int showPopUp ) {
text += cardInPcmcia0Name;
popUp( text, "cardmon/" + cardInPcmcia0Type );
}
if ( cardWas1 != cardInPcmcia1 ) {
if ( cardInPcmcia1 ) {
text += tr( "New card: " );
what = "on";
} else {
text += tr( "Ejected: " );
what = "off";
}
text += cardInPcmcia1Name;
popUp( text, "cardmon/" + cardInPcmcia1Type );
}
#ifndef QT_NO_SOUND
QSound::play( Resource::findSound( "cardmon/card" + what ) );
#endif
}
} else {
// no file found
odebug << "no file found" << oendl;
cardInPcmcia0 = FALSE;
cardInPcmcia1 = FALSE;
}
repaint( FALSE );
return ( ( cardWas0 == cardInPcmcia0
&& cardWas1 == cardInPcmcia1 ) ? FALSE : TRUE );
}
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" );
if ( mntfp ) {
while ( ( me = getmntent( mntfp ) ) != 0 ) {
QString fs = QFile::decodeName( me->mnt_fsname );
//odebug << fs << oendl;
if ( fs.left( 14 ) == "/dev/mmc/part1" || fs.left( 7 ) == "/dev/sd"
- || fs.left( 9 ) == "/dev/mmcd" ) {
+ || fs.left( 9 ) == "/dev/mmcd" || fs.left(11) == "/dev/mmcblk" ) {
cardInSd = TRUE;
cardSdName = fs;
show();
}
// else {
// cardInSd = FALSE;
// }
}
endmntent( mntfp );
}
if ( !showPopUp && cardWas != cardInSd ) {
QString text = QString::null;
QString what = QString::null;
if ( cardInSd ) {
text += tr("New card: SD/MMC");
what = "on";
} else {
text += tr("Ejected: SD/MMC");
what = "off";
}
//odebug << "TEXT: " + text << oendl;
#ifndef QT_NO_SOUND
QSound::play( Resource::findSound( "cardmon/card" + what ) );
#endif
popUp( text, "cardmon/ide" ); // XX add SD pic
}
#else
#error "Not on Linux"
#endif
repaint( FALSE );
return ( ( cardWas == cardInSd ) ? FALSE : TRUE );
}
void CardMonitor::paintEvent( QPaintEvent * ) {
QPainter p( this );
if ( cardInPcmcia0 || cardInPcmcia1 || cardInSd ) {
p.drawPixmap( 0, 0, pm );
show();
} else {
//p.eraseRect(rect());
hide();
}
}