Merge remote-tracking branch 'origin/KDE/4.10'

konqueror/src/konqsessionmanager.cpp

@@ -475,6 +475,11 @@ void KonqSessionManager::saveCurrentSessionToFile(const QString& sessionConfigPa
     configGroup.writeEntry("Number of Windows", counter);
 }
 
+QString KonqSessionManager::autosaveDirectory() const
+{
+    return m_autosaveDir;
+}
+
 QStringList KonqSessionManager::takeSessionsOwnership()
 {
     // Tell to other konqueror instances that we are the one dealing with

konqueror/src/konqsessionmanager.h

@@ -154,6 +154,11 @@ public:
      * Save current session in a given path (absolute path to a file)
      */
     void saveCurrentSessionToFile(const QString& sessionConfig);
+    
+    /**
+     * Returns the autosave directory
+     */
+    QString autosaveDirectory() const;
 
 public Q_SLOTS:
     /**

konqueror/src/tests/konqviewmgrtest.cpp

@@ -32,6 +32,7 @@
 #include <konqsessionmanager.h>
 #include <kstandarddirs.h>
 #include <kconfiggroup.h>
+#include <ktempdir.h>
 #include <kio/job.h>
 #include <QLayout>
 
@@ -116,6 +117,7 @@ private:
 
 void ViewMgrTest::initTestCase()
 {
+    KTempDir::removeDir(KonqSessionManager::self()->autosaveDirectory());
     KonqSessionManager::self()->disableAutosave();
     QCOMPARE(KGlobal::mainComponent().componentName(), QString("konqueror"));
     QCOMPARE(KonqSettings::mmbOpensTab(), true);