| -rw-r--r-- | core/applets/cardmon/cardmon.cpp | 15 | ||||
| -rw-r--r-- | core/applets/cardmon/cardmon.h | 1 |
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 @@ -140,9 +140,4 @@ void CardMonitor::mousePressEvent( QMouseEvent * ) { } 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 ) { @@ -284,3 +279,3 @@ bool CardMonitor::getStatusSd( int showPopUp ) { while ( ( me = getmntent( mntfp ) ) != 0 ) { - QString fs = me->mnt_fsname; + QString fs = QFile::decodeName( me->mnt_fsname ); //odebug << fs << oendl; @@ -289,2 +284,3 @@ bool CardMonitor::getStatusSd( int showPopUp ) { cardInSd = TRUE; + cardSdName = fs; show(); @@ -340,2 +336,4 @@ int CardMonitor::position() { void CardMonitor::execCommand( const QString &command ) { + delete m_process; + m_process = 0; @@ -373,5 +371,2 @@ void CardMonitor::slotExited( OProcess* ) { } - - delete m_process; - m_process = 0; } 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 @@ -61,2 +61,3 @@ private: bool cardInSd; + QString cardSdName; // the device which is mounted void iconShow(); |