summaryrefslogtreecommitdiff
path: root/core/applets/cardmon/cardmon.cpp
authorzecke <zecke>2002-06-23 14:19:13 (UTC)
committer zecke <zecke>2002-06-23 14:19:13 (UTC)
commitce9178fb13908eca5b7835e785fc0914a5022615 (patch) (unidiff)
treed848ef07fb25ba6c21d3729140c4e3be9d69f6f6 /core/applets/cardmon/cardmon.cpp
parent3b02ead2254e59159db948d2a0980892eeb14ed8 (diff)
downloadopie-ce9178fb13908eca5b7835e785fc0914a5022615.zip
opie-ce9178fb13908eca5b7835e785fc0914a5022615.tar.gz
opie-ce9178fb13908eca5b7835e785fc0914a5022615.tar.bz2
Simon thanks for the patch. Some clean ups. Patch provided by tronical
OAOAOAOAOAOAOAOAOAOAOAOAOBOBCVS: noncore/tools/remote/dvdgroupconf.cpp
Diffstat (limited to 'core/applets/cardmon/cardmon.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r--core/applets/cardmon/cardmon.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/core/applets/cardmon/cardmon.cpp b/core/applets/cardmon/cardmon.cpp
index 3dd9f54..93bc97a 100644
--- a/core/applets/cardmon/cardmon.cpp
+++ b/core/applets/cardmon/cardmon.cpp
@@ -143,25 +143,25 @@ void CardMonitor::cardMessage( const QCString &msg, const QByteArray & ) {
143 // qDebug("Pcmcia: stabchanged"); 143 // qDebug("Pcmcia: stabchanged");
144 if ( getStatusPcmcia() ) { 144 if ( getStatusPcmcia() ) {
145 repaint(FALSE); 145 repaint(FALSE);
146 } 146 }
147 } else if ( msg == "mtabChanged()" ) { 147 } else if ( msg == "mtabChanged()" ) {
148 // qDebug("Pcmcia: mtabchanged"); 148 // qDebug("Pcmcia: mtabchanged");
149 if ( getStatusSd() ) { 149 if ( getStatusSd() ) {
150 repaint(FALSE); 150 repaint(FALSE);
151 } 151 }
152 } 152 }
153} 153}
154 154
155bool CardMonitor::getStatusPcmcia( int showPopUp = FALSE ) { 155bool CardMonitor::getStatusPcmcia( int showPopUp ) {
156 156
157 bool cardWas0 = cardInPcmcia0; // remember last state 157 bool cardWas0 = cardInPcmcia0; // remember last state
158 bool cardWas1 = cardInPcmcia1; 158 bool cardWas1 = cardInPcmcia1;
159 159
160 QString fileName; 160 QString fileName;
161 161
162 // one of these 3 files should exist 162 // one of these 3 files should exist
163 if (QFile::exists("/var/run/stab")) { 163 if (QFile::exists("/var/run/stab")) {
164 fileName = "/var/run/stab"; 164 fileName = "/var/run/stab";
165 } else if (QFile::exists("/var/state/pcmcia/stab")) { 165 } else if (QFile::exists("/var/state/pcmcia/stab")) {
166 fileName="/var/state/pcmcia/stab"; 166 fileName="/var/state/pcmcia/stab";
167 } else { 167 } else {
@@ -226,25 +226,25 @@ bool CardMonitor::getStatusPcmcia( int showPopUp = FALSE ) {
226 else { text += tr("Ejected: "); } 226 else { text += tr("Ejected: "); }
227 text += cardInPcmcia1Name; 227 text += cardInPcmcia1Name;
228 } 228 }
229 popUp( text ); 229 popUp( text );
230 } 230 }
231 231
232 f.close(); 232 f.close();
233 233
234 return ((cardWas0 == cardInPcmcia0 || cardWas1 == cardInPcmcia1) ? FALSE : TRUE); 234 return ((cardWas0 == cardInPcmcia0 || cardWas1 == cardInPcmcia1) ? FALSE : TRUE);
235} 235}
236 236
237 237
238bool CardMonitor::getStatusSd( int showPopUp = FALSE ) { 238bool CardMonitor::getStatusSd( int showPopUp ) {
239 239
240 bool cardWas=cardInSd; // remember last state 240 bool cardWas=cardInSd; // remember last state
241 cardInSd=false; 241 cardInSd=false;
242 242
243#if defined(_OS_LINUX_) || defined(Q_OS_LINUX) 243#if defined(_OS_LINUX_) || defined(Q_OS_LINUX)
244 struct mntent *me; 244 struct mntent *me;
245 FILE *mntfp = setmntent( "/etc/mtab", "r" ); 245 FILE *mntfp = setmntent( "/etc/mtab", "r" );
246 246
247 if ( mntfp ) { 247 if ( mntfp ) {
248 while ( (me = getmntent( mntfp )) != 0 ) { 248 while ( (me = getmntent( mntfp )) != 0 ) {
249 QString fs = me->mnt_fsname; 249 QString fs = me->mnt_fsname;
250 if ( fs.left(7)=="/dev/sd" || fs.left(9) == "/dev/mmcd" ) { 250 if ( fs.left(7)=="/dev/sd" || fs.left(9) == "/dev/mmcd" ) {