summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/applets/cardmon/cardmon.cpp15
-rw-r--r--core/applets/cardmon/cardmon.h1
2 files changed, 6 insertions, 10 deletions
diff --git a/core/applets/cardmon/cardmon.cpp b/core/applets/cardmon/cardmon.cpp
index 48146ab..43ccce2 100644
--- a/core/applets/cardmon/cardmon.cpp
+++ b/core/applets/cardmon/cardmon.cpp
@@ -133,23 +133,18 @@ void CardMonitor::mousePressEvent( QMouseEvent * ) {
QSize s = menu->sizeHint();
int opt = menu->exec( QPoint( p.x() + ( width() / 2 ) - ( s.width() / 2 ),
p.y() - s.height() ), 0 );
if ( opt == 1 ) {
m_commandOrig = 1;
execCommand("/sbin/cardctl eject 0");
} else if ( opt == 0 ) {
- if ( ODevice::inst() ->system() == System_Familiar ) {
- cmd = "umount /dev/mmc/part1";
- } else {
- cmd = "umount /dev/mmcda1";
- }
m_commandOrig = 2;
- execCommand( cmd );
+ execCommand( QString("umount %1").arg(cardSdName));
} else if ( opt == 2 ) {
m_commandOrig = 3;
execCommand( "/sbin/cardctl eject 1" );
}
delete menu;
}
@@ -277,21 +272,22 @@ bool CardMonitor::getStatusSd( int showPopUp ) {
#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 = me->mnt_fsname;
+ 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" ) {
cardInSd = TRUE;
+ cardSdName = fs;
show();
}
// else {
// cardInSd = FALSE;
// }
}
endmntent( mntfp );
}
@@ -333,16 +329,18 @@ void CardMonitor::paintEvent( QPaintEvent * ) {
}
}
int CardMonitor::position() {
return 7;
}
void CardMonitor::execCommand( const QString &command ) {
+ delete m_process;
+ m_process = 0;
if ( m_process == 0 ) {
m_process = new OProcess();
QStringList strList = QStringList::split( " ", command );
for ( QStringList::Iterator it = strList.begin(); it != strList.end(); ++it ) {
*m_process << *it;
}
@@ -366,15 +364,12 @@ void CardMonitor::slotExited( OProcess* ) {
popUp( tr( "CF/PCMCIA card eject failed!" ) );
} else if ( m_commandOrig == 2 ) {
popUp( tr( "SD/MMC card eject failed!" ) );
} else if ( m_commandOrig == 3 ) {
popUp( tr( "CF/PCMCIA card eject failed!" ) );
}
}
}
-
- delete m_process;
- m_process = 0;
}
EXPORT_OPIE_APPLET_v1( CardMonitor )
diff --git a/core/applets/cardmon/cardmon.h b/core/applets/cardmon/cardmon.h
index 19d0394..b02c8b1 100644
--- a/core/applets/cardmon/cardmon.h
+++ b/core/applets/cardmon/cardmon.h
@@ -54,16 +54,17 @@ private:
bool cardInPcmcia0;
QString cardInPcmcia0Name;
QString cardInPcmcia0Type;
// pcmcia socket 1
bool cardInPcmcia1;
QString cardInPcmcia1Name;
QString cardInPcmcia1Type;
bool cardInSd;
+ QString cardSdName; // the device which is mounted
void iconShow();
QPopupMenu *popupMenu;
void popUp(QString message, QString icon = QString::null );
Opie::Core::OProcess* m_process;
};
#endif