damned QFileInfo::isExecutable bug...

1 files changed, 9 insertions, 2 deletions

diff --git a/noncore/apps/advancedfm/advancedfm.cpp b/noncore/apps/advancedfm/advancedfm.cpp
index e3ab76b..7cd8644 100644
--- a/noncore/apps/advancedfm/advancedfm.cpp
+++ b/noncore/apps/advancedfm/advancedfm.cpp
@@ -685,116 +685,123 @@ void AdvancedFm::showLocalMenu(QListViewItem * item)
     }
 }
 
 void AdvancedFm::showRemoteMenu(QListViewItem * item)
 {
     if(item) {
         QPopupMenu  m;
         m.insertItem(  tr( "Show Hidden Files" ), this,  SLOT( showRemoteHidden() ));
         m.insertSeparator();
         if( /*item->text(0).right(1) == "/" ||*/ item->text(0).find("/",0,TRUE) !=-1)
             m.insertItem( tr( "Change Directory" ), this, SLOT( doRemoteCd() ));
         else
             m.insertItem( tr( "Open" ), this, SLOT( runThis() ));
         m.insertItem( tr( "Open as Text" ), this, SLOT( runText() ));
         m.insertItem( tr( "Make Directory" ), this, SLOT( remoteMakDir() ));
         m.insertItem( tr( "Make Symlink" ), this, SLOT( mkSym() ));
         m.insertSeparator();
         m.insertItem( tr( "Rename" ), this, SLOT( remoteRename() ));
         m.insertItem( tr( "Copy" ), this, SLOT( copy() ));
         m.insertItem( tr( "Copy As" ), this, SLOT( copyAs() ));
         m.insertItem( tr( "Move" ), this, SLOT( move() ));
         m.insertSeparator();
         m.insertItem( tr( "Rescan" ), this, SLOT( populateRemoteView() ));
         m.insertItem( tr( "Run Command" ), this, SLOT( runCommand() ));
         m.insertItem( tr( "File Info" ), this, SLOT( fileStatus() ));
         m.insertSeparator();
         m.insertItem( tr( "Delete" ), this, SLOT( remoteDelete() ));
         m.insertSeparator();
         m.insertItem( tr( "Set Permissions" ), this, SLOT( filePerms() ));
         m.insertItem( tr( "Properties" ), this, SLOT( doProperties() ));
         m.setCheckable(TRUE);
         if (!b)
             m.setItemChecked(m.idAt(0),TRUE);
         else
             m.setItemChecked(m.idAt(0),FALSE);
         m.exec( QCursor::pos() );
     }    
 }
 
 void AdvancedFm::runThis() {
 //    QFileInfo *fi;
 QString fs;    
     if (TabWidget->currentPageIndex() == 0) {
         QString curFile = Local_View->currentItem()->text(0);
 
         fs= getFileSystemType((const QString &) currentDir.canonicalPath());
         QFileInfo fileInfo( currentDir.canonicalPath()+"/"+curFile);
         qDebug( fileInfo.owner());
-         if( fileInfo.isExecutable() || fs == "vfat" && fileInfo.filePath().contains("/bin") ) {
+        if( (fileInfo.permission( QFileInfo::ExeUser)
+             | fileInfo.permission( QFileInfo::ExeGroup)
+             | fileInfo.permission( QFileInfo::ExeOther)) // & fs.find("vfat",0,TRUE) == -1) {
+            | fs == "vfat" && fileInfo.filePath().contains("/bin") ) {
+//        if( fileInfo.isExecutable() |
              QCopEnvelope e("QPE/System", "execute(QString)" );
              e << curFile;
          } else {
         curFile =  currentDir.canonicalPath()+"/"+curFile;
             DocLnk nf(curFile);
             QString execStr = nf.exec();
             qDebug( execStr);
             if( execStr.isEmpty() ) {
             } else {
                 nf.execute();
             }
          }
 //         MimeType mt( curFile);
     } else {
         QString curFile = Remote_View->currentItem()->text(0);
         fs= getFileSystemType((const QString &) currentRemoteDir.canonicalPath());
         qDebug("Filesystemtype is "+fs);
         QFileInfo fileInfo( currentRemoteDir.canonicalPath()+"/"+curFile);
-         if(fileInfo.isExecutable() || fs == "vfat" && fileInfo.filePath().contains("/bin") ) {
+        if( (fileInfo.permission( QFileInfo::ExeUser)
+             | fileInfo.permission( QFileInfo::ExeGroup)
+             | fileInfo.permission( QFileInfo::ExeOther)) // & fs.find("vfat",0,TRUE) == -1) {
+            | fs == "vfat" && fileInfo.filePath().contains("/bin") ) {
                  QCopEnvelope e("QPE/System", "execute(QString)" );
                  e << curFile;
          } else {
         curFile =  currentRemoteDir.canonicalPath()+"/"+curFile;
             DocLnk nf(curFile);
             QString execStr = nf.exec();
             qDebug(execStr);
             if( execStr.isEmpty() ) {
             } else {
                 nf.execute();
             }
          }
 //         MimeType mt( curFile);
     }
 }
 
 void AdvancedFm::runText() {
     if (TabWidget->currentPageIndex() == 0) {
         QString curFile = Local_View->currentItem()->text(0);
         curFile =  currentDir.canonicalPath()+"/"+curFile;
         QCopEnvelope e("QPE/Application/textedit", "setDocument(QString)" );
         e << curFile;
     } else {
         QString curFile = Remote_View->currentItem()->text(0);
         curFile =  currentRemoteDir.canonicalPath()+"/"+curFile;
         DocLnk nf(curFile);
         QCopEnvelope e("QPE/Application/textedit", "setDocument(QString)" );
         e << curFile;
     }
 }
 
 void AdvancedFm::localMakDir()
 {
     InputDialog *fileDlg;
     fileDlg = new InputDialog(this,tr("Make Directory"),TRUE, 0);
     fileDlg->exec();
     if( fileDlg->result() == 1 ) {
        QString  filename = fileDlg->LineEdit1->text();
        currentDir.mkdir( currentDir.canonicalPath()+"/"+filename);
     }
     populateLocalView();
 }
 
 void AdvancedFm::remoteMakDir()
 {
     InputDialog *fileDlg;
     fileDlg = new InputDialog(this,tr("Make Directory"),TRUE, 0);
     fileDlg->exec();