From a52fd4b1995e34963888397587aa2592ea858da6 Mon Sep 17 00:00:00 2001
From: llornkcor <llornkcor>
Date: Thu, 02 May 2002 03:35:28 +0000
Subject: I hate vfat.. I really do, or maybe I hate the way the kernel deals with it

---
(limited to 'noncore/apps/advancedfm/advancedfm.cpp')

diff --git a/noncore/apps/advancedfm/advancedfm.cpp b/noncore/apps/advancedfm/advancedfm.cpp
index b224deb..f4ca349 100644
--- a/noncore/apps/advancedfm/advancedfm.cpp
+++ b/noncore/apps/advancedfm/advancedfm.cpp
@@ -318,17 +318,18 @@ void AdvancedFm::populateLocalView()
                 else
                     pm= Resource::loadPixmap( "folder" );
 //                 item->setPixmap( 0,pm );
+            } else if ( fs == "vfat" && fileInfo.filePath().contains("/bin") ) {
+                pm = Resource::loadPixmap( "exec");
             } else if( (fileInfo.permission( QFileInfo::ExeUser)
-                     | fileInfo.permission( QFileInfo::ExeGroup)
-                       | fileInfo.permission( QFileInfo::ExeOther))
-                       | fs == "vfat" && fileInfo.filePath().contains("/bin") ) {
-                    pm = Resource::loadPixmap( "exec");
+                        | fileInfo.permission( QFileInfo::ExeGroup)
+                        | fileInfo.permission( QFileInfo::ExeOther)) && fs != "vfat" ) {
+                pm = Resource::loadPixmap( "exec");
 //                 else { //is exec
 //                  pm = Resource::loadPixmap( "exec");
 //                 }
 // //                 item->setPixmap( 0,pm);
-            } else if( !fi->isReadable() ) { 
-                pm = Resource::loadPixmap( "locked" );
+        } else if( !fi->isReadable() ) { 
+            pm = Resource::loadPixmap( "locked" );
 //                 item->setPixmap( 0,pm);
             } else { //everything else goes by mimetype
                 MimeType mt(fi->filePath());
@@ -430,7 +431,7 @@ void AdvancedFm::populateRemoteView()
 //     qDebug( fileL);
             }
         }
-        QFileInfo fileInfo(  currentDir.canonicalPath()+"/"+fileL);
+        QFileInfo fileInfo(  currentRemoteDir.canonicalPath()+"/"+fileL);
         if(fileL !="./" && fi->exists()) {
             item= new QListViewItem( Remote_View, fileL, fileS, fileDate);
             QPixmap pm;
@@ -441,12 +442,12 @@ void AdvancedFm::populateRemoteView()
                 else
                     pm= Resource::loadPixmap( "folder" );
 //                 item->setPixmap( 0,pm );
+            } else if ( fs == "vfat" && fileInfo.filePath().contains("/bin") ) {
+                pm = Resource::loadPixmap( "exec");
             } else if( (fileInfo.permission( QFileInfo::ExeUser)
-                     | fileInfo.permission( QFileInfo::ExeGroup)
-                       | fileInfo.permission( QFileInfo::ExeOther))
-                       | fs == "vfat" && fileInfo.filePath().contains("/bin") ) {
-/////                }  else if(fileInfo.isExecutable()){ //is exec <<<< BROKEN!!
-                  pm = Resource::loadPixmap( "exec");
+                        | fileInfo.permission( QFileInfo::ExeGroup)
+                        | fileInfo.permission( QFileInfo::ExeOther)) && fs != "vfat" ) {
+                pm = Resource::loadPixmap( "exec");
 //                     item->setPixmap( 0,pm);
             } else if( !fi->isReadable() ) {
                 pm = Resource::loadPixmap( "locked" );
--
cgit v0.9.0.2