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

List:       kde-commits
Subject:    [kde-baseapps/KDE/4.9] dolphin/src/settings: Only store the HomeUrl in dolphinrc if it is not the us
From:       Frank Reininghaus <frank78ac () googlemail ! com>
Date:       2012-10-31 21:51:49
Message-ID: 20121031215149.6BE2CA6078 () git ! kde ! org
[Download RAW message or body]

Git commit f84c4267edb0a8dde796d744f3338633cc81e572 by Frank Reininghaus.
Committed on 31/10/2012 at 22:43.
Pushed by freininghaus into branch 'KDE/4.9'.

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

This fixes the problem that copying the dolphinrc from another user
results in Dolphin starting up in a folder that might wither not be
accessible or not exist at all.

BUG: 308569
FIXED-IN: 4.9.3

M  +2    -1    dolphin/src/settings/dolphin_generalsettings.kcfg

http://commits.kde.org/kde-baseapps/f84c4267edb0a8dde796d744f3338633cc81e572

diff --git a/dolphin/src/settings/dolphin_generalsettings.kcfg \
b/dolphin/src/settings/dolphin_generalsettings.kcfg index 0507501..849a9c7 100644
--- a/dolphin/src/settings/dolphin_generalsettings.kcfg
+++ b/dolphin/src/settings/dolphin_generalsettings.kcfg
@@ -5,6 +5,7 @@
       xsi:schemaLocation="http://www.kde.org/standards/kcfg/1.0
       http://www.kde.org/standards/kcfg/1.0/kcfg.xsd">
     <include>QDir</include>
+    <include>KUrl</include>
     <include>kglobalsettings.h</include>
     <kcfgfile name="dolphinrc"/>
     <group name="General">
@@ -30,7 +31,7 @@
         </entry>
         <entry name="HomeUrl" type="String">
             <label>Home URL</label>
-            <default code="true">QDir::homePath()</default>
+            <default code="true">KUrl(QDir::homePath()).prettyUrl()</default>
         </entry>
         <entry name="SplitView" type="Bool">
             <label>Split the view into two panes</label>


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