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

List:       kde-commits
Subject:    KDE/kdelibs/nepomuk
From:       Sebastian Trueg <sebastian () trueg ! de>
Date:       2010-11-16 15:11:34
Message-ID: 20101116151134.A7FB7AC8A3 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1197802 by trueg:

Fixed formatting of resource relations. This will re-enable nice album or artist display in Dolphin.

 M  +1 -1      core/variant.cpp  
 M  +3 -2      utils/utils.cpp  


--- trunk/KDE/kdelibs/nepomuk/core/variant.cpp #1197801:1197802
@@ -849,7 +849,7 @@
     else if( isDateTime() )
         return Soprano::LiteralValue( toDateTime() ).toString();
     else if( isUrl() )
-        return toUrl().toString();
+        return KUrl(toUrl()).pathOrUrl();
     else if( isResource() )
         return toResource().genericLabel();
     else
--- trunk/KDE/kdelibs/nepomuk/utils/utils.cpp #1197801:1197802
@@ -112,8 +112,9 @@
         valueString = KGlobal::locale()->formatNumber(value.toDouble());
     }
 
-    else if(value.isUrl()) {
-        valueString = KUrl(value.toUrl()).pathOrUrl();
+    else if(value.isResource() &&
+            value.toResource().exists()) {
+        valueString = value.toResource().genericLabel();
     }
 
     else {
[prev in list] [next in list] [prev in thread] [next in thread]