summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/applets/cardmon/cardmon.cpp6
1 files changed, 2 insertions, 4 deletions
diff --git a/core/applets/cardmon/cardmon.cpp b/core/applets/cardmon/cardmon.cpp
index 74e8837..815c993 100644
--- a/core/applets/cardmon/cardmon.cpp
+++ b/core/applets/cardmon/cardmon.cpp
@@ -138,55 +138,53 @@ void CardMonitor::mousePressEvent( QMouseEvent * ) {
138 } 138 }
139 } else { 139 } else {
140 cmd = "/etc/sdcontrol compeject"; 140 cmd = "/etc/sdcontrol compeject";
141 err = system( ( const char *) cmd ); 141 err = system( ( const char *) cmd );
142 if ( ( err != 0 ) ) { 142 if ( ( err != 0 ) ) {
143 qDebug( "Could not execute `/etc/sdcontrol comeject'! err=%d", err ); 143 qDebug( "Could not execute `/etc/sdcontrol comeject'! err=%d", err );
144 popUp( tr("SD/MMC card eject failed!") ); 144 popUp( tr("SD/MMC card eject failed!") );
145 } 145 }
146 } 146 }
147 } else if ( opt == 2 ) { 147 } else if ( opt == 2 ) {
148 cmd = "/sbin/cardctl eject 1"; 148 cmd = "/sbin/cardctl eject 1";
149 err = system( ( const char *) cmd ); 149 err = system( ( const char *) cmd );
150 if ( ( err == 127 ) || ( err < 0 ) ) { 150 if ( ( err == 127 ) || ( err < 0 ) ) {
151 qDebug( "Could not execute `/sbin/cardctl eject 1'! err=%d", err ); 151 qDebug( "Could not execute `/sbin/cardctl eject 1'! err=%d", err );
152 popUp( tr( "CF/PCMCIA card eject failed!" ) ); 152 popUp( tr( "CF/PCMCIA card eject failed!" ) );
153 } 153 }
154 } 154 }
155 delete menu; 155 delete menu;
156} 156}
157 157
158 158
159void CardMonitor::cardMessage( const QCString &msg, const QByteArray & ) { 159void CardMonitor::cardMessage( const QCString &msg, const QByteArray & ) {
160 if ( msg == "stabChanged()" ) { 160 if ( msg == "stabChanged()" ) {
161 // qDebug("Pcmcia: stabchanged"); 161 // qDebug("Pcmcia: stabchanged");
162 if ( getStatusPcmcia() ) { 162 getStatusPcmcia();
163 repaint( FALSE );
164 } 163 }
165 } else if ( msg == "mtabChanged()" ) { 164 } else if ( msg == "mtabChanged()" ) {
166 qDebug("CARDMONAPPLET: mtabchanged"); 165 qDebug("CARDMONAPPLET: mtabchanged");
167 if ( getStatusSd() ) { 166 getStatusSd();
168 repaint( FALSE );
169 } 167 }
170 } 168 }
171} 169}
172 170
173bool CardMonitor::getStatusPcmcia( int showPopUp ) { 171bool CardMonitor::getStatusPcmcia( int showPopUp ) {
174 172
175 bool cardWas0 = cardInPcmcia0; // remember last state 173 bool cardWas0 = cardInPcmcia0; // remember last state
176 bool cardWas1 = cardInPcmcia1; 174 bool cardWas1 = cardInPcmcia1;
177 175
178 QString fileName; 176 QString fileName;
179 177
180 // one of these 3 files should exist 178 // one of these 3 files should exist
181 if ( QFile::exists( "/var/run/stab" ) ) { 179 if ( QFile::exists( "/var/run/stab" ) ) {
182 fileName = "/var/run/stab"; 180 fileName = "/var/run/stab";
183 } else if (QFile::exists( "/var/state/pcmcia/stab" ) ) { 181 } else if (QFile::exists( "/var/state/pcmcia/stab" ) ) {
184 fileName = "/var/state/pcmcia/stab"; 182 fileName = "/var/state/pcmcia/stab";
185 } else { 183 } else {
186 fileName = "/var/lib/pcmcia/stab"; 184 fileName = "/var/lib/pcmcia/stab";
187 } 185 }
188 186
189 QFile f( fileName ); 187 QFile f( fileName );
190 188
191 if ( f.open( IO_ReadOnly ) ) { 189 if ( f.open( IO_ReadOnly ) ) {
192 QStringList list; 190 QStringList list;