summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/applets/cardmon/cardmon.cpp2
1 files changed, 0 insertions, 2 deletions
diff --git a/core/applets/cardmon/cardmon.cpp b/core/applets/cardmon/cardmon.cpp
index 815c993..1663af2 100644
--- a/core/applets/cardmon/cardmon.cpp
+++ b/core/applets/cardmon/cardmon.cpp
@@ -131,70 +131,68 @@ void CardMonitor::mousePressEvent( QMouseEvent * ) {
131 } 131 }
132 } else if ( opt == 0 ) { 132 } else if ( opt == 0 ) {
133 if ( ODevice::inst()->system() == System_Familiar ) { 133 if ( ODevice::inst()->system() == System_Familiar ) {
134 cmd = "umount /dev/mmc/part1"; 134 cmd = "umount /dev/mmc/part1";
135 err = system( ( const char *) cmd ); 135 err = system( ( const char *) cmd );
136 if ( ( err != 0 ) ) { 136 if ( ( err != 0 ) ) {
137 popUp( tr("SD/MMC card eject failed!") ); 137 popUp( tr("SD/MMC card eject failed!") );
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 getStatusPcmcia(); 162 getStatusPcmcia();
163 }
164 } else if ( msg == "mtabChanged()" ) { 163 } else if ( msg == "mtabChanged()" ) {
165 qDebug("CARDMONAPPLET: mtabchanged"); 164 qDebug("CARDMONAPPLET: mtabchanged");
166 getStatusSd(); 165 getStatusSd();
167 } 166 }
168 }
169} 167}
170 168
171bool CardMonitor::getStatusPcmcia( int showPopUp ) { 169bool CardMonitor::getStatusPcmcia( int showPopUp ) {
172 170
173 bool cardWas0 = cardInPcmcia0; // remember last state 171 bool cardWas0 = cardInPcmcia0; // remember last state
174 bool cardWas1 = cardInPcmcia1; 172 bool cardWas1 = cardInPcmcia1;
175 173
176 QString fileName; 174 QString fileName;
177 175
178 // one of these 3 files should exist 176 // one of these 3 files should exist
179 if ( QFile::exists( "/var/run/stab" ) ) { 177 if ( QFile::exists( "/var/run/stab" ) ) {
180 fileName = "/var/run/stab"; 178 fileName = "/var/run/stab";
181 } else if (QFile::exists( "/var/state/pcmcia/stab" ) ) { 179 } else if (QFile::exists( "/var/state/pcmcia/stab" ) ) {
182 fileName = "/var/state/pcmcia/stab"; 180 fileName = "/var/state/pcmcia/stab";
183 } else { 181 } else {
184 fileName = "/var/lib/pcmcia/stab"; 182 fileName = "/var/lib/pcmcia/stab";
185 } 183 }
186 184
187 QFile f( fileName ); 185 QFile f( fileName );
188 186
189 if ( f.open( IO_ReadOnly ) ) { 187 if ( f.open( IO_ReadOnly ) ) {
190 QStringList list; 188 QStringList list;
191 QTextStream stream ( &f ); 189 QTextStream stream ( &f );
192 QString streamIn; 190 QString streamIn;
193 streamIn = stream.read(); 191 streamIn = stream.read();
194 list = QStringList::split( "\n", streamIn ); 192 list = QStringList::split( "\n", streamIn );
195 for( QStringList::Iterator line=list.begin(); line!=list.end(); line++ ) { 193 for( QStringList::Iterator line=list.begin(); line!=list.end(); line++ ) {
196 if( (*line).startsWith( "Socket 0:" ) ){ 194 if( (*line).startsWith( "Socket 0:" ) ){
197 if( (*line).startsWith( "Socket 0: empty" ) && cardInPcmcia0 ){ 195 if( (*line).startsWith( "Socket 0: empty" ) && cardInPcmcia0 ){
198 cardInPcmcia0 = FALSE; 196 cardInPcmcia0 = FALSE;
199 } else if ( !(*line).startsWith( "Socket 0: empty" ) && !cardInPcmcia0 ){ 197 } else if ( !(*line).startsWith( "Socket 0: empty" ) && !cardInPcmcia0 ){
200 cardInPcmcia0Name = (*line).mid( ( (*line).find( ':' ) + 1 ), (*line).length() - 9 ); 198 cardInPcmcia0Name = (*line).mid( ( (*line).find( ':' ) + 1 ), (*line).length() - 9 );