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

List:       kde-commits
Subject:    KDE/kdelibs/kded
From:       David Faure <faure () kde ! org>
Date:       2010-11-26 23:57:32
Message-ID: 20101126235732.3AE23AC8A2 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1201162 by dfaure:

don't call realPath with a relative path.


 M  +4 -2      vfolder_menu.cpp  


--- trunk/KDE/kdelibs/kded/vfolder_menu.cpp #1201161:1201162
@@ -431,11 +431,13 @@
    if (!dir.endsWith('/'))
       dir += '/';
 
-   if (QDir::isRelativePath(dir) && !keepRelativeToCfg)
-   {
+   bool relative = QDir::isRelativePath(dir);
+   if (relative && !keepRelativeToCfg) {
+      relative = false;
       dir = KGlobal::dirs()->findResource("xdgconf-menu", dir);
    }
 
+   if (!relative)
    dir = KGlobal::dirs()->realPath(dir);
 
    return dir;
[prev in list] [next in list] [prev in thread] [next in thread]