summaryrefslogtreecommitdiff
path: root/noncore/applets/pcmcia/pcmcia.cpp
Unidiff
Diffstat (limited to 'noncore/applets/pcmcia/pcmcia.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/applets/pcmcia/pcmcia.cpp9
1 files changed, 5 insertions, 4 deletions
diff --git a/noncore/applets/pcmcia/pcmcia.cpp b/noncore/applets/pcmcia/pcmcia.cpp
index aea699f..99c1bc9 100644
--- a/noncore/applets/pcmcia/pcmcia.cpp
+++ b/noncore/applets/pcmcia/pcmcia.cpp
@@ -54,12 +54,13 @@ using namespace Opie::Ui;
54 54
55/* STD */ 55/* STD */
56#include <stdio.h> 56#include <stdio.h>
57#include <unistd.h> 57#include <unistd.h>
58#include <stdlib.h> 58#include <stdlib.h>
59#include <string.h> 59#include <string.h>
60#include <errno.h>
60#include <fcntl.h> 61#include <fcntl.h>
61#if defined(_OS_LINUX_) || defined(Q_OS_LINUX) 62#if defined(_OS_LINUX_) || defined(Q_OS_LINUX)
62#include <sys/vfs.h> 63#include <sys/vfs.h>
63#include <mntent.h> 64#include <mntent.h>
64#endif 65#endif
65 66
@@ -133,14 +134,14 @@ void PcmciaManager::mousePressEvent( QMouseEvent* )
133 submenu->insertItem( "&Resume", RESUME+i*100 ); 134 submenu->insertItem( "&Resume", RESUME+i*100 );
134 submenu->insertItem( "Rese&t", RESET+i*100 ); 135 submenu->insertItem( "Rese&t", RESET+i*100 );
135 submenu->insertItem( "&Configure", CONFIGURE+i*100 ); 136 submenu->insertItem( "&Configure", CONFIGURE+i*100 );
136 137
137 submenu->setItemEnabled( EJECT+i*100, !it.current()->isEmpty() ); 138 submenu->setItemEnabled( EJECT+i*100, !it.current()->isEmpty() );
138 submenu->setItemEnabled( INSERT+i*100, it.current()->isEmpty() ); 139 submenu->setItemEnabled( INSERT+i*100, it.current()->isEmpty() );
139 submenu->setItemEnabled( SUSPEND+i*100, !it.current()->isEmpty() && !it.current()->isSuspended() ); 140 submenu->setItemEnabled( SUSPEND+i*100, !it.current()->isEmpty() && it.current()->isSuspended() );
140 submenu->setItemEnabled( RESUME+i*100, !it.current()->isEmpty() && it.current()->isSuspended() ); 141 submenu->setItemEnabled( RESUME+i*100, !it.current()->isEmpty() && !it.current()->isSuspended() );
141 submenu->setItemEnabled( CONFIGURE+i*100, !it.current()->isEmpty() && !configuring ); 142 submenu->setItemEnabled( CONFIGURE+i*100, !it.current()->isEmpty() && !configuring );
142 143
143 connect( submenu, SIGNAL(activated(int)), this, SLOT(userCardAction(int)) ); 144 connect( submenu, SIGNAL(activated(int)), this, SLOT(userCardAction(int)) );
144 menu->insertItem( tr( "%1: %2" ).arg( i++ ).arg( it.current()->identity() ), submenu, 1 ); 145 menu->insertItem( tr( "%1: %2" ).arg( i++ ).arg( it.current()->identity() ), submenu, 1 );
145 ++it; 146 ++it;
146 } 147 }
@@ -256,13 +257,13 @@ int PcmciaManager::position()
256void PcmciaManager::execCommand( const QStringList &strList ) 257void PcmciaManager::execCommand( const QStringList &strList )
257{ 258{
258} 259}
259 260
260void PcmciaManager::userCardAction( int action ) 261void PcmciaManager::userCardAction( int action )
261{ 262{
262 odebug << "user action requested. action = " << action << oendl; 263 odebug << "user action on socket " << action / 100 << " requested. action = " << action << oendl;
263 264
264 int socket = action / 100; 265 int socket = action / 100;
265 int what = action % 100; 266 int what = action % 100;
266 bool success = false; 267 bool success = false;
267 268
268 switch ( what ) 269 switch ( what )
@@ -275,13 +276,13 @@ void PcmciaManager::userCardAction( int action )
275 case RESET: success = OPcmciaSystem::instance()->socket( socket )->reset(); break; 276 case RESET: success = OPcmciaSystem::instance()->socket( socket )->reset(); break;
276 default: odebug << "not yet implemented" << oendl; 277 default: odebug << "not yet implemented" << oendl;
277 } 278 }
278 279
279 if ( !success ) 280 if ( !success )
280 { 281 {
281 owarn << "couldn't perform user action" << oendl; 282 owarn << "couldn't perform user action (" << strerror( errno ) << ")" << oendl;
282 } 283 }
283 284
284} 285}
285 286
286void PcmciaManager::configure( OPcmciaSocket* card ) 287void PcmciaManager::configure( OPcmciaSocket* card )
287{ 288{