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

List:       kde-commits
Subject:    extragear/network/kmldonkey/kmldonkey
From:       Aleksey Markelov <markelovai () gmail ! com>
Date:       2009-06-08 14:53:27
Message-ID: 1244472807.530088.14326.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 978923 by amarkelov:

Fix improper file type detection for file names containing #
BUG:193801


 M  +2 -2      infolist.cpp  
 M  +1 -1      searchtabresult.cpp  
 M  +2 -2      sharepage.cpp  


--- trunk/extragear/network/kmldonkey/kmldonkey/infolist.cpp #978922:978923
@@ -585,7 +585,7 @@
             return FileInfo::humanReadableTime( age, true );
         }
         case 13: // filetype
-            return KMimeType::findByUrl( KUrl( "file:/" + it->fileName() ), 0, \
false, true )->comment(); +            return KMimeType::findByUrl( KUrl::fromPath( \
it->fileName() ), 0, false, true )->comment();  
         default:
             return "ERROR!";
@@ -808,7 +808,7 @@
         case 4: // hash
             return it->fileUid();
         case 5: // filetype
-            return KMimeType::findByUrl( KUrl( "file:/" + it->fileName() ), 0, \
false, true )->comment(); +            return KMimeType::findByUrl( KUrl::fromPath( \
it->fileName() ), 0, false, true )->comment();  
         default:
             return "ERROR!";
--- trunk/extragear/network/kmldonkey/kmldonkey/searchtabresult.cpp #978922:978923
@@ -97,7 +97,7 @@
         case 3:
             return nwName;
         case 4:
-            return KMimeType::findByUrl( KUrl( "file:/" + name ), 0, false, true \
)->comment(); +            return KMimeType::findByUrl( KUrl::fromPath( name ), 0, \
false, true )->comment();  case 5:
             return format;
         case 6:
--- trunk/extragear/network/kmldonkey/kmldonkey/sharepage.cpp #978922:978923
@@ -71,7 +71,7 @@
     case 3: // bytes
         return FileInfo::humanReadableSize(it->shareUploaded());
     case 4: // File Type
-        return KMimeType::findByUrl( KUrl( "file:/" + it->shareName() ), 0, false, \
true)->comment(); +        return KMimeType::findByUrl( KUrl::fromPath( \
it->shareName() ), 0, false, true)->comment();  default:
         return "ERROR!";
     }
@@ -132,7 +132,7 @@
             case 6: return QString::number(ci->clientRating());
             case 7: return \
                FileInfo::humanReadableTime((time_t)ci->clientConnectTime(), true);
             case 8: return ci->clientSoftware() + " " + ci->clientEmuleMod();
-            case 9: return KMimeType::findByUrl( KUrl( "file:/" + ci->clientUpload() \
), 0, false, true)->comment(); +            case 9: return KMimeType::findByUrl( \
KUrl::fromPath( ci->clientUpload() ), 0, false, true)->comment();  default: break;
         }
 


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