2 files changed, 4 insertions, 28 deletions

diff --git a/noncore/apps/advancedfm/advancedfm.cpp b/noncore/apps/advancedfm/advancedfm.cpp
index 3bfec7d..3cd2067 100644
--- a/noncore/apps/advancedfm/advancedfm.cpp
+++ b/noncore/apps/advancedfm/advancedfm.cpp
@@ -339,13 +339,13 @@ QStringList AdvancedFm::getPath() {
 //        odebug << it.current()->text(0) << oendl;
       }
    }
    return strList;
 }
 
-void AdvancedFm::changeTo(QString dir) {
+void AdvancedFm::changeTo(const QString dir) {
    chdir( dir.latin1());
    CurrentDir()->cd(dir, TRUE);
    populateView();
    update();
 }
 
@@ -696,13 +696,13 @@ void AdvancedFm::gotoCustomDir(const QString &dir) {
    if( dir == s_addBookmark) {
       addCustomDir();
    }
    if( dir == s_removeBookmark) {
       removeCustomDir( );
    } else {
-      gotoDirectory( dir);
+      changeTo( dir);
 //       if(QDir( curDir).exists() )
 //         {
 //           thisDir->setPath( curDir );
 //           chdir( curDir.latin1() );
 //           thisDir->cd( curDir, TRUE);
 //           populateView();
@@ -763,44 +763,21 @@ void AdvancedFm::qcopReceive(const QCString &msg, const QByteArray &data) {
 //   odebug << "qcop message "+msg << oendl;
    QDataStream stream ( data, IO_ReadOnly );
    if ( msg == "openDirectory(QString)" ) {
 //      odebug << "received" << oendl;
       QString file;
       stream >> file;
-      gotoDirectory( (const QString &) file);
+      changeTo( (const QString &) file);
    }
 }
 
 void AdvancedFm::setDocument(const QString &file) {
-   gotoDirectory( file);
+   changeTo( file);
 
 }
 
-void AdvancedFm::gotoDirectory(const QString &file) {
-//   qDebug("goto dir "+file);
-   QString curDir = file;
-   QDir *thisDir = CurrentDir();
-   if(QDir( curDir).exists() )  {
-      thisDir->setPath( curDir );
-      chdir( curDir.latin1() );
-      thisDir->cd( curDir, TRUE);
-      populateView();
-   }
-   else if(QFileInfo(curDir).exists()) {
-      QFileInfo fileInfo(curDir);
-      curDir=fileInfo.dirPath();
-      if(QDir( curDir).exists() )  {
-         thisDir->setPath( curDir );
-         chdir( curDir.latin1() );
-         thisDir->cd( curDir, TRUE);
-         populateView();
-      }
-      findFile(file);
-   }
-
-}
 
 void AdvancedFm::findFile(const QString &fileName) {
    QFileInfo fi(fileName);
    QListView *thisView = CurrentView();
    QListViewItemIterator it( thisView );
    for ( ; it.current(); ++it ) {
diff --git a/noncore/apps/advancedfm/advancedfm.h b/noncore/apps/advancedfm/advancedfm.h
index 9dbdc70..00ab909 100644
--- a/noncore/apps/advancedfm/advancedfm.h
+++ b/noncore/apps/advancedfm/advancedfm.h
@@ -174,13 +174,12 @@ private:
    void cancelRename();
    void doRename(QListView *);
    void okRename();
    void customDirsToMenu();
    void addCustomDir();
    void removeCustomDir();
-   void gotoDirectory(const QString &);
    void navigateToSelected();
    void findFile(const QString &);
 
 private slots:
    void processEnded(Opie::Core::OProcess *);
    void oprocessStderr(Opie::Core::OProcess *, char *, int);