1 files changed, 4 insertions, 4 deletions

diff --git a/noncore/net/opieftp/opieftp.cpp b/noncore/net/opieftp/opieftp.cpp
index a3b29a1..814d706 100644
--- a/noncore/net/opieftp/opieftp.cpp
+++ b/noncore/net/opieftp/opieftp.cpp
@@ -474,33 +474,33 @@ void OpieFtp::populateLocalView()
             fileS.sprintf( "%10li", sym.size() );
             fileL.sprintf( "%s ->  %s",  sym.fileName().data(),sym.absFilePath().data() );
             fileDate = sym.lastModified().toString();
         } else {
 //        qDebug("Not a dir: "+currentDir.canonicalPath()+fileL);
             fileS.sprintf( "%10li", fi->size() );
             fileL.sprintf( "%s",fi->fileName().data() );
             fileDate= fi->lastModified().toString();
             if( QDir(QDir::cleanDirPath(currentDir.canonicalPath()+"/"+fileL)).exists() ) {
                 fileL+="/";
                 isDir=TRUE;
 //     qDebug( fileL);
             }
         }
         if(fileL !="./") {
         item = new QListViewItem( Local_View,fileL,fileS, fileDate);
-        if(isDir)
+        if(isDir || fileL.find("/",0,TRUE) != -1)
             item->setPixmap( 0,  Resource::loadPixmap( "folder" ));
         else
             item->setPixmap( 0, Resource::loadPixmap( "fileopen" ));
         }
         isDir=FALSE;
         ++it;
      }
     Local_View->setSorting( 3,FALSE);
     currentPathEdit->setText( currentDir.canonicalPath() );
 }
 
 bool OpieFtp::populateRemoteView( )
 {
 //    qDebug("populate remoteview");
     QString sfile=QDir::homeDirPath();
     if(sfile.right(1) != "/")
@@ -514,33 +514,33 @@ bool OpieFtp::populateRemoteView( )
     QString fileL, fileS, fileDate;
     if ( file.open(IO_ReadOnly)) {
         QTextStream t( &file );   // use a text stream
         while ( !t.eof()) {
             s = t.readLine();
             fileL = s.right(s.length()-55);
             fileL = fileL.stripWhiteSpace();
             if(s.left(1) == "d") 
                 fileL = fileL+"/";
 //                  fileL = "/"+fileL+"/";
             fileS = s.mid( 30, 42-30);
             fileS = fileS.stripWhiteSpace();
             fileDate = s.mid( 42, 55-42);
             fileDate = fileDate.stripWhiteSpace();
             if(fileL.find("total",0,TRUE) == -1) {
                 QListViewItem * item = new QListViewItem( Remote_View, fileL, fileS, fileDate);
-                if(s.left(1) == "d") {
+                if(s.left(1) == "d" || fileL.find("/",0,TRUE) != -1) {
                     item->setPixmap( 0, Resource::loadPixmap( "folder" ));
                       if(itemDir)
                           item->moveItem(itemDir);
                       itemDir=item;
                 } else {
                     item->setPixmap( 0, Resource::loadPixmap( "fileopen" ));
                       if(itemFile)
                           item->moveItem(itemFile);
                       itemFile=item;
                 }
             }
         }
         QListViewItem * item1 = new QListViewItem( Remote_View, "../");
         item1->setPixmap( 0, Resource::loadPixmap( "folder" ));
         file.close();
         if( file.exists())
@@ -682,49 +682,49 @@ void OpieFtp::ListPressed( int mouse, QListViewItem *item, const QPoint &point,
 }
 
 void OpieFtp::RemoteListPressed( int mouse, QListViewItem *item, const QPoint &point, int i)
 {
  switch (mouse) {
       case 1:
           break;
       case 2:
           showRemoteMenu(item);
     break;
     };
 }
 
 void OpieFtp::showRemoteMenu(QListViewItem * item)
 {
     QPopupMenu  m;// = new QPopupMenu( Local_View );
-    if(item->text(0).right(1) == "/")
+    if( /*item->text(0).right(1) == "/" ||*/ item->text(0).find("/",0,TRUE))
     m.insertItem( tr( "Change Directory" ), this, SLOT( doRemoteCd() ));
     else
     m.insertItem( tr( "Download" ), this, SLOT( remoteDownload() ));
     m.insertItem( tr( "Make Directory" ), this, SLOT( remoteMakDir() ));
     m.insertItem( tr( "Rename" ), this, SLOT( remoteRename() ));
     m.insertSeparator();
     m.insertItem( tr( "Delete" ), this, SLOT( remoteDelete() ));
     m.exec( QCursor::pos() );
 }
 
 void OpieFtp::showLocalMenu(QListViewItem * item)
 {
     QPopupMenu  m;
     m.insertItem(  tr( "Show Hidden Files" ), this,  SLOT( showHidden() ));
     m.insertSeparator();
-    if(item->text(0).right(1) == "/")
+    if( /*item->text(0).right(1) == "/" ||*/ item->text(0).find("/",0,TRUE))
     m.insertItem( tr( "Change Directory" ), this, SLOT( doLocalCd() ));
     else
     m.insertItem( tr( "Upload" ), this, SLOT( localUpload() ));
     m.insertItem( tr( "Make Directory" ), this, SLOT( localMakDir() ));
     m.insertItem( tr( "Rename" ), this, SLOT( localRename() ));
     m.insertSeparator();
     m.insertItem( tr( "Delete" ), this, SLOT( localDelete() ));
     m.setCheckable(TRUE);
     if (b)
         m.setItemChecked(m.idAt(0),TRUE);
     else
         m.setItemChecked(m.idAt(0),FALSE);
 
     m.exec( QCursor::pos() );
 }