The Home folder location, when set via loadSettings(), and when set via the 'Use Default Location' button, now will use KUrl::prettyUrl(); Prior to this, saving an address of '/home/user/' would be changed to 'file:///home/user' (on Linux) normally (through applySettings()). However, when the listed methods were called, the text of the line edit would be just '/home/user/'. It will now (basically) be set to 'file:///'... all throughout.

svn path=/trunk/KDE/kdebase/apps/; revision=920943

1 files changed, 4 insertions, 2 deletions

diff --git a/src/settings/startupsettingspage.cpp b/src/settings/startupsettingspage.cpp
index 62d3c401e..fd79debc3 100644
--- a/src/settings/startupsettingspage.cpp
+++ b/src/settings/startupsettingspage.cpp
@@ -153,13 +153,15 @@ void StartupSettingsPage::useCurrentLocation()
 
 void StartupSettingsPage::useDefaultLocation()
 {
-    m_homeUrl->setText(QDir::homePath());
+   KUrl url(QDir::homePath());
+    m_homeUrl->setText(url.prettyUrl());
 }
 
 void StartupSettingsPage::loadSettings()
 {
     GeneralSettings* settings = DolphinSettings::instance().generalSettings();
-    m_homeUrl->setText(settings->homeUrl());
+    KUrl url(settings->homeUrl());
+    m_homeUrl->setText(url.prettyUrl());
     m_splitView->setChecked(settings->splitView());
     m_editableUrl->setChecked(settings->editableUrl());
     m_showFullPath->setChecked(settings->showFullPath());