~ is no useful home folder in a Windows environment (thanks to Michael O'Shea for...

BUG: 156463
CCMAIL: michael.a.oshea@gmail.com

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

diff --git a/src/dolphin_generalsettings.kcfg b/src/dolphin_generalsettings.kcfg
index 6149480b31e9d9f6fb6d86b03c132a3340ce5a24..33b66a1772af71ba645f13d3bb0ec6368f4a82ca 100644 (file)
--- a/src/dolphin_generalsettings.kcfg
+++ b/src/dolphin_generalsettings.kcfg
@@ -13,7 +13,7 @@
         </entry>
         <entry name="HomeUrl" type="String">
             <label context="@label">Home URL</label>
-            <default>~</default>
+            <default></default>
         </entry>
         <entry name="SplitView" type="Bool">
             <label context="@label">Split the view into two panes</label>

diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp
index 668f92b7c6cea56b403fe3e7376cf09e9b4f84bc..e393b22d0700977f450a69f907e68b0201536392 100644 (file)
--- a/src/dolphinmainwindow.cpp
+++ b/src/dolphinmainwindow.cpp
@@ -612,6 +612,9 @@ void DolphinMainWindow::init()
     const bool firstRun = generalSettings->firstRun();
     if (firstRun) {
         generalSettings->setViewPropsTimestamp(QDateTime::currentDateTime());
+        Q_ASSERT(generalSettings->homeUrl().isEmpty());
+        const KUrl homeUrl(QDir::homePath());
+        generalSettings->setHomeUrl(homeUrl.prettyUrl());
     }
 
     setAcceptDrops(true);