summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--library/storage.cpp14
1 files changed, 9 insertions, 5 deletions
diff --git a/library/storage.cpp b/library/storage.cpp
index 35e0255..937908d 100644
--- a/library/storage.cpp
+++ b/library/storage.cpp
@@ -84,7 +84,7 @@ const FileSystem *StorageInfo::fileSystemOf( const QString &filename )
84void StorageInfo::cardMessage( const QCString& msg, const QByteArray& ) 84void StorageInfo::cardMessage( const QCString& msg, const QByteArray& )
85{ 85{
86 if ( msg == "mtabChanged()" ) 86 if ( msg == "mtabChanged()" )
87 update(); 87 update();
88} 88}
89// cause of the lack of a d pointer we need 89// cause of the lack of a d pointer we need
90// to store informations in a config file :( 90// to store informations in a config file :(
@@ -104,8 +104,9 @@ void StorageInfo::update()
104 while ( (me = getmntent( mntfp )) != 0 ) { 104 while ( (me = getmntent( mntfp )) != 0 ) {
105 QString fs = me->mnt_fsname; 105 QString fs = me->mnt_fsname;
106 if ( fs.left(7)=="/dev/hd" || fs.left(7)=="/dev/sd" 106 if ( fs.left(7)=="/dev/hd" || fs.left(7)=="/dev/sd"
107 || fs.left(8)=="/dev/mtd" || fs.left(9) == "/dev/mmcd" 107 || fs.left(8)=="/dev/mtd" || fs.left(9) == "/dev/mmcd"
108 || fs.left(5)=="tmpfs" ) 108 || fs.left( 14 ) == "/dev/mmc/part1"
109 || fs.left(5)=="tmpfs" )
109 { 110 {
110 n++; 111 n++;
111 curdisks.append(fs); 112 curdisks.append(fs);
@@ -132,8 +133,8 @@ void StorageInfo::update()
132 QStringList::ConstIterator optsIt=curopts.begin(); 133 QStringList::ConstIterator optsIt=curopts.begin();
133 for (; it!=curdisks.end(); ++it, ++fsit, ++optsIt) { 134 for (; it!=curdisks.end(); ++it, ++fsit, ++optsIt) {
134 QString opts = *optsIt; 135 QString opts = *optsIt;
135 136
136 QString disk = *it; 137 QString disk = *it;
137 QString humanname; 138 QString humanname;
138 bool removable = FALSE; 139 bool removable = FALSE;
139 if ( isCF(disk) ) { 140 if ( isCF(disk) ) {
@@ -144,6 +145,9 @@ void StorageInfo::update()
144 } else if ( disk.left(9) == "/dev/mmcd" ) { 145 } else if ( disk.left(9) == "/dev/mmcd" ) {
145 humanname = tr("SD Card"); 146 humanname = tr("SD Card");
146 removable = TRUE; 147 removable = TRUE;
148 } else if ( disk.left( 14 ) == "/dev/mmc/part1" ) {
149 humanname = tr("MMC Card");
150 removable = TRUE;
147 } else if ( disk.left(7) == "/dev/hd" ) 151 } else if ( disk.left(7) == "/dev/hd" )
148 humanname = tr("Hard Disk") + " " + disk; 152 humanname = tr("Hard Disk") + " " + disk;
149 else if ( disk.left(7) == "/dev/sd" ) 153 else if ( disk.left(7) == "/dev/sd" )