Diffstat (limited to 'core/applets/cardmon/cardmon.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | core/applets/cardmon/cardmon.cpp | 15 |
1 files changed, 5 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 @@ -137,15 +137,10 @@ void CardMonitor::mousePressEvent( QMouseEvent * ) { 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" ); } @@ -281,13 +276,14 @@ bool CardMonitor::getStatusSd( int showPopUp ) { 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; @@ -337,8 +333,10 @@ 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 ); @@ -370,11 +368,8 @@ void CardMonitor::slotExited( OProcess* ) { popUp( tr( "CF/PCMCIA card eject failed!" ) ); } } } - - delete m_process; - m_process = 0; } EXPORT_OPIE_APPLET_v1( CardMonitor ) |