4 files changed, 4 insertions, 18 deletions

diff --git a/noncore/apps/advancedfm/advancedfm.cpp b/noncore/apps/advancedfm/advancedfm.cpp
index 9721f84..6f017b4 100644
--- a/noncore/apps/advancedfm/advancedfm.cpp
+++ b/noncore/apps/advancedfm/advancedfm.cpp
@@ -318,19 +318,12 @@ void  AdvancedFm::fillCombo(const QString &currentPath) {
          remoteDirPathStringList.prepend( currentPath );
          currentPathCombo->insertStringList( remoteDirPathStringList,-1);
       }
    }
 }
 
-void AdvancedFm::currentPathComboActivated(const QString & currentPath) {
-   chdir( currentPath.latin1() );
-   CurrentDir()->cd( currentPath, TRUE);
-   populateView();
-   update();
-}
-
 QStringList AdvancedFm::getPath() {
    QStringList strList;
    QListView *thisView=CurrentView();
    QList<QListViewItem> * getSelectedItems( QListView * thisView );
    QListViewItemIterator it( thisView );
    for ( ; it.current(); ++it ) {
diff --git a/noncore/apps/advancedfm/advancedfm.h b/noncore/apps/advancedfm/advancedfm.h
index 00ab909..6f7eb96 100644
--- a/noncore/apps/advancedfm/advancedfm.h
+++ b/noncore/apps/advancedfm/advancedfm.h
@@ -150,13 +150,12 @@ protected slots:
    void copyAsTimer();
    void copySameDir();
    void copySameDirTimer();
    void move();
    void moveTimer();
 
-	 void currentPathComboActivated(const QString &);
    void fillCombo(const QString &);
    bool copyFile( const QString & , const QString & );
    void fileStatus();
    void doAbout();
    void doBeam();
    void fileBeamFinished( Ir *);
diff --git a/noncore/apps/advancedfm/advancedfmData.cpp b/noncore/apps/advancedfm/advancedfmData.cpp
index fe565a0..1047c5a 100644
--- a/noncore/apps/advancedfm/advancedfmData.cpp
+++ b/noncore/apps/advancedfm/advancedfmData.cpp
@@ -252,13 +252,13 @@ void AdvancedFm::initConnections()
   connect( qpeDirButton ,SIGNAL(released()),this,SLOT( QPEButtonPushed()) );
   connect( cfButton ,SIGNAL(released()), this,SLOT( CFButtonPushed()) );
   connect( sdButton ,SIGNAL(released()), this,SLOT( SDButtonPushed()) );
   connect( cdUpButton ,SIGNAL(released()), this,SLOT( upDir()) );
   connect( docButton,SIGNAL(released()), this,SLOT( docButtonPushed()) );
   connect( homeButton,SIGNAL(released()), this,SLOT( homeButtonPushed()) );
-  connect( currentPathCombo, SIGNAL( activated(const QString&) ), this, SLOT( currentPathComboActivated(const QString&) ) );
+  connect( currentPathCombo, SIGNAL( activated(const QString&) ), this, SLOT( changeTo(const QString&) ) );
 
   connect( currentPathCombo->lineEdit(),SIGNAL(returnPressed()), this,SLOT(currentPathComboChanged()));
 
   connect( Local_View, SIGNAL( clicked(QListViewItem*)), this,SLOT( ListClicked(QListViewItem*)) );
 
   connect( Local_View, SIGNAL( mouseButtonPressed(int,QListViewItem*,const QPoint&,int)), this,SLOT( ListPressed(int,QListViewItem*,const QPoint&,int)) );
diff --git a/noncore/apps/advancedfm/advancedfmMenu.cpp b/noncore/apps/advancedfm/advancedfmMenu.cpp
index 706658e..7b3dcf6 100644
--- a/noncore/apps/advancedfm/advancedfmMenu.cpp
+++ b/noncore/apps/advancedfm/advancedfmMenu.cpp
@@ -256,22 +256,16 @@ void AdvancedFm::doProperties() {
    }
 #endif
 
 }
 
 void AdvancedFm::upDir() {
-  QDir *thisDir = CurrentDir();
-  QString current = thisDir->canonicalPath();
-  QDir dir(current);
-  dir.cdUp();
-  current = dir.canonicalPath();
-  chdir( current.latin1() );
-  thisDir->cd(  current, TRUE);
 
-    populateView();
-  update();
+  QDir dir( CurrentDir()->canonicalPath());
+  dir.cdUp();
+	changeTo(dir.canonicalPath());
 }
 
 void AdvancedFm::copyTimer() {
 		QTimer::singleShot(125,this,SLOT(copy()));
 }