Only store the HomeUrl in dolphinrc if it is not the user's home folder

[dolphin.git] / src / settings / dolphinsettingsdialog.cpp

diff --git a/src/settings/dolphinsettingsdialog.cpp b/src/settings/dolphinsettingsdialog.cpp
index 2a62fc1cf5f14b4a7bb96658686c34f18cfa58e3..609e2ab92d69b61bc0cdb0b478fae9076b796521 100644 (file)
--- a/src/settings/dolphinsettingsdialog.cpp
+++ b/src/settings/dolphinsettingsdialog.cpp
@@ -22,7 +22,6 @@
 
 #include <dolphinapplication.h>
 #include <dolphinmainwindow.h>
-#include "dolphinsettings.h"
 #include "dolphin_generalsettings.h"
 #include "general/generalsettingspage.h"
 #include "navigation/navigationsettingspage.h"
@@ -31,9 +30,9 @@
 #include "viewmodes/viewsettingspage.h"
 #include "trash/trashsettingspage.h"
 
-#include <klocale.h>
-#include <kmessagebox.h>
-#include <kicon.h>
+#include <KLocale>
+#include <KMessageBox>
+#include <KIcon>
 
 DolphinSettingsDialog::DolphinSettingsDialog(const KUrl& url, QWidget* parent) :
     KPageDialog(parent),
@@ -129,12 +128,13 @@ void DolphinSettingsDialog::applySettings()
     foreach (SettingsPageBase* page, m_pages) {
         page->applySettings();
     }
-    DolphinApplication::app()->refreshMainWindows();
 
-    GeneralSettings* settings = DolphinSettings::instance().generalSettings();
+    emit settingsChanged();
+
+    GeneralSettings* settings = GeneralSettings::self();
     if (settings->modifiedStartupSettings()) {
         // Reset the modified startup settings hint. The changed startup settings
-        // have been applied already in app()->refreshMainWindows().
+        // have been applied already due to emitting settingsChanged().
         settings->setModifiedStartupSettings(false);
         settings->writeConfig();
     }