[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdeextragear-1/amarok/amarok
From:       Mark Kretschmann <markey () web ! de>
Date:       2004-01-31 18:59:53
Message-ID: 20040131185953.792289840 () office ! kde ! org
[Download RAW message or body]

CVS commit by markey: 

Restore directory in filebrowser.


  M +4 -12     filebrowser.cpp   1.6
  M +0 -1      filebrowser.h   1.5


--- kdeextragear-1/amarok/amarok/filebrowser.cpp  #1.5:1.6
@@ -229,10 +229,6 @@ void KDevFileSelector::readConfig()
     if ( AmarokConfig::restoreLocation() || kapp->isRestored() )
     {
-        QString loc( AmarokConfig::location() );
-        if ( ! loc.isEmpty() )
-        {
-            waitingDir = loc;
-            QTimer::singleShot(0, this, SLOT(initialDirChangeHack()));
-        }
+        if ( ! AmarokConfig::location().isEmpty() )
+            setDir( AmarokConfig::location() );
     }
 
@@ -252,8 +248,4 @@ void KDevFileSelector::readConfig()
 }
 
-void KDevFileSelector::initialDirChangeHack()
-{
-    setDir( waitingDir );
-}
 
 void KDevFileSelector::setupToolbar()

--- kdeextragear-1/amarok/amarok/filebrowser.h  #1.4:1.5
@@ -131,5 +131,4 @@ protected:
     void showEvent( QShowEvent * );
     bool eventFilter( QObject *, QEvent * );
-    void initialDirChangeHack();
     KURL activeDocumentUrl();
 


[prev in list] [next in list] [prev in thread] [next in thread]