summaryrefslogtreecommitdiff
authorzecke <zecke>2004-09-18 01:08:08 (UTC)
committer zecke <zecke>2004-09-18 01:08:08 (UTC)
commit5096f9bd9f1a06e5238e2206eee195c43a2bdb6b (patch) (side-by-side diff)
tree57281b88624984d3b2dc7950cd2a5f586f06f076
parent081f8a3c3a6c6d45743f451cd9dc966a135b8156 (diff)
downloadopie-5096f9bd9f1a06e5238e2206eee195c43a2bdb6b.zip
opie-5096f9bd9f1a06e5238e2206eee195c43a2bdb6b.tar.gz
opie-5096f9bd9f1a06e5238e2206eee195c43a2bdb6b.tar.bz2
The following change is untested on a real device. So please try and
bitch if I broke something!!! Make unmounting of sdcards more robust. If we find a /dev/mmcard1 or /dev/mmc/1 or /dev/mmc* we will remember that device name and if the user asks us to eject it we will use that name.
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
@@ -138,13 +138,8 @@ void CardMonitor::mousePressEvent( QMouseEvent * ) {
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" );
@@ -282,11 +277,12 @@ bool CardMonitor::getStatusSd( int showPopUp ) {
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 {
@@ -338,6 +334,8 @@ int CardMonitor::position() {
}
void CardMonitor::execCommand( const QString &command ) {
+ delete m_process;
+ m_process = 0;
if ( m_process == 0 ) {
m_process = new OProcess();
@@ -371,9 +369,6 @@ void CardMonitor::slotExited( OProcess* ) {
}
}
}
-
- 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
@@ -59,6 +59,7 @@ private:
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 );