4 files changed, 4 insertions, 24 deletions
diff --git a/noncore/apps/advancedfm/advancedfm.cpp b/noncore/apps/advancedfm/advancedfm.cpp
index a47edd8..afb44f5 100644
--- a/noncore/apps/advancedfm/advancedfm.cpp
+++ b/noncore/apps/advancedfm/advancedfm.cpp
@@ -37,7 +37,3 @@ using namespace Opie::Ui;
 
-#ifdef NOQUICKLAUNCH
-AdvancedFm::AdvancedFm( )
-#else
 AdvancedFm::AdvancedFm(QWidget *,const char*, WFlags )
-#endif
    : QMainWindow( ) {
@@ -261,5 +257,2 @@ void AdvancedFm::ListPressed( int mouse, QListViewItem *item, const QPoint& , in
    break;
-   case 2:
-      menuTimer.start( 500, TRUE );
-      break;
    };
@@ -608,8 +601,2 @@ void AdvancedFm::showFileMenu() {
 
-void AdvancedFm::cancelMenuTimer() {
-
-   if( menuTimer.isActive() )
-      menuTimer.stop();
-}
-
 QString AdvancedFm::checkDiskSpace(const QString &path) {
diff --git a/noncore/apps/advancedfm/advancedfm.h b/noncore/apps/advancedfm/advancedfm.h
index 4eaa6d6..effda0b 100644
--- a/noncore/apps/advancedfm/advancedfm.h
+++ b/noncore/apps/advancedfm/advancedfm.h
@@ -57,7 +57,3 @@ public:
     static QString appName() { return QString::fromLatin1("advancedfm"); }
-#ifdef NOQUICKLAUNCH
-   AdvancedFm();
-#else
    AdvancedFm(QWidget *p = 0, const char* name = 0, WFlags fl = 0);
-#endif
    ~AdvancedFm();
@@ -141,3 +137,2 @@ protected slots:
    void showFileMenu();
-   void cancelMenuTimer();
    void homeButtonPushed();
@@ -168,3 +163,2 @@ private:
    QString oldName;
-   QTimer menuTimer;
    void startProcess(const QString &);
diff --git a/noncore/apps/advancedfm/advancedfmData.cpp b/noncore/apps/advancedfm/advancedfmData.cpp
index 29335f8..dc7e8e1 100644
--- a/noncore/apps/advancedfm/advancedfmData.cpp
+++ b/noncore/apps/advancedfm/advancedfmData.cpp
@@ -275,4 +275,2 @@ void AdvancedFm::initConnections()
 
-  connect( Local_View, SIGNAL( selectionChanged() ), SLOT( cancelMenuTimer() ) );
-
   connect( Remote_View, SIGNAL( clicked(QListViewItem*)),
@@ -285,3 +283,6 @@ void AdvancedFm::initConnections()
 
-  connect( &menuTimer, SIGNAL( timeout() ), SLOT( showFileMenu() ) );
+  connect( Remote_View, SIGNAL(rightButtonPressed(QListViewItem*, const QPoint&, int)),
+           this, SLOT(showFileMenu()));
+  connect( Local_View, SIGNAL(rightButtonPressed(QListViewItem*, const QPoint&,int)),
+           this, SLOT(showFileMenu()));
 
diff --git a/noncore/apps/advancedfm/main.cpp b/noncore/apps/advancedfm/main.cpp
index df0d4af..06fc741 100644
--- a/noncore/apps/advancedfm/main.cpp
+++ b/noncore/apps/advancedfm/main.cpp
@@ -2,4 +2,2 @@
 /***************************************************************************
-using namespace Opie::Core;
-using namespace Opie::Core;
                           main.cpp  -  description