Diffstat (limited to 'core/applets/cardmon/cardmon.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | core/applets/cardmon/cardmon.cpp | 35 |
1 files changed, 20 insertions, 15 deletions
diff --git a/core/applets/cardmon/cardmon.cpp b/core/applets/cardmon/cardmon.cpp index 43ccce2..fb140fe 100644 --- a/core/applets/cardmon/cardmon.cpp +++ b/core/applets/cardmon/cardmon.cpp @@ -109,5 +109,6 @@ void CardMonitor::popupTimeout() { void CardMonitor::mousePressEvent( QMouseEvent * ) { QPopupMenu * menu = new QPopupMenu( this ); - QString cmd; + QStringList cmd; + bool execute = true; if ( cardInSd ) { @@ -136,13 +137,18 @@ void CardMonitor::mousePressEvent( QMouseEvent * ) { if ( opt == 1 ) { - m_commandOrig = 1; - execCommand("/sbin/cardctl eject 0"); + m_commandOrig = PCMCIA_Socket1; + cmd << "/sbin/cardctl" << "eject" << "0"; } else if ( opt == 0 ) { - m_commandOrig = 2; - execCommand( QString("umount %1").arg(cardSdName)); + m_commandOrig = MMC_Socket; + cmd << "umount" << cardSdName; } else if ( opt == 2 ) { - m_commandOrig = 3; - execCommand( "/sbin/cardctl eject 1" ); - } + m_commandOrig = PCMCIA_Socket2; + cmd << "/sbin/cardctl" << "eject" << "1"; + }else + execute = false; + + if ( execute ) + execCommand( cmd ); + delete menu; } @@ -334,5 +340,5 @@ int CardMonitor::position() { } -void CardMonitor::execCommand( const QString &command ) { +void CardMonitor::execCommand( const QStringList &strList ) { delete m_process; m_process = 0; @@ -340,7 +346,7 @@ void CardMonitor::execCommand( const QString &command ) { if ( m_process == 0 ) { m_process = new OProcess(); - QStringList strList = QStringList::split( " ", command ); - for ( QStringList::Iterator it = strList.begin(); it != strList.end(); ++it ) { + + for ( QStringList::ConstIterator it = strList.begin(); it != strList.end(); ++it ) { *m_process << *it; } @@ -361,10 +367,9 @@ void CardMonitor::slotExited( OProcess* ) { int ret = m_process->exitStatus(); if( ret != 0 ) { - if ( m_commandOrig == 1 ) { + if ( m_commandOrig == PCMCIA_Socket1 || + m_commandOrig == PCMCIA_Socket2 ) { popUp( tr( "CF/PCMCIA card eject failed!" ) ); - } else if ( m_commandOrig == 2 ) { + } else if ( m_commandOrig == MMC_Socket ) { popUp( tr( "SD/MMC card eject failed!" ) ); - } else if ( m_commandOrig == 3 ) { - popUp( tr( "CF/PCMCIA card eject failed!" ) ); } } |