summaryrefslogtreecommitdiff
path: root/library/lnkproperties.cpp
authorllornkcor <llornkcor>2002-06-24 13:03:30 (UTC)
committer llornkcor <llornkcor>2002-06-24 13:03:30 (UTC)
commit2a6e2c554e9a1b647fa9d6827948c38fdbaf3f2a (patch) (side-by-side diff)
treedc2f59a5f5ac841c962db050f7db94f821f56b7c /library/lnkproperties.cpp
parent428959b4974f51d55c088c0f6d73ee24b726a702 (diff)
downloadopie-2a6e2c554e9a1b647fa9d6827948c38fdbaf3f2a.zip
opie-2a6e2c554e9a1b647fa9d6827948c38fdbaf3f2a.tar.gz
opie-2a6e2c554e9a1b647fa9d6827948c38fdbaf3f2a.tar.bz2
small fix sent some time ago by Max Weninger, for non familiar 'standard' file layout
Diffstat (limited to 'library/lnkproperties.cpp') (more/less context) (show whitespace changes)
-rw-r--r--library/lnkproperties.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/library/lnkproperties.cpp b/library/lnkproperties.cpp
index ebfd4bf..28a71e9 100644
--- a/library/lnkproperties.cpp
+++ b/library/lnkproperties.cpp
@@ -149,49 +149,49 @@ void LnkProperties::unlinkIcon()
} else {
reject();
}
}
}
void LnkProperties::setupLocations()
{
QFileInfo fi( lnk->file() );
fileSize = fi.size();
StorageInfo storage;
const QList<FileSystem> &fs = storage.fileSystems();
QListIterator<FileSystem> it ( fs );
QString s;
QString homeDir = getenv("HOME");
QString hardDiskHome;
QString hardDiskPath;
int index = 0;
currentLocation = -1;
for ( ; it.current(); ++it ) {
// we add 10k to the file size so we are sure we can also save the desktop file
if ( (*it)->availBlocks() * (*it)->blockSize() > fileSize + 10000 ) {
if ( (*it)->isRemovable() ||
(*it)->disk() == "/dev/mtdblock1" ||
- (*it)->disk() == "/dev/mtdblock/1" ) {
+ (*it)->disk() == "/dev/mtdblock/1" || (*it)->disk().left(13) == "/dev/mtdblock" ) {
d->locationCombo->insertItem( (*it)->name(), index );
locations.append( ((*it)->isRemovable() ? (*it)->path() : homeDir) );
if ( lnk->file().contains( (*it)->path() ) ) {
d->locationCombo->setCurrentItem( index );
currentLocation = index;
}
index++;
} else if ( (*it)->name().contains( "Hard Disk") &&
homeDir.contains( (*it)->path() ) &&
(*it)->path().length() > hardDiskHome.length() ) {
hardDiskHome = (*it)->name();
hardDiskPath = (*it)->path();
}
}
}
if ( !hardDiskHome.isEmpty() ) {
d->locationCombo->insertItem( hardDiskHome );
locations.append( hardDiskPath );
if ( currentLocation == -1 ) { // assume it's the hard disk
d->locationCombo->setCurrentItem( index );
currentLocation = index;
}
}
}