← Back to branch summary

~ubuntu-branches/ubuntu/maverick/kdeutils/maverick-proposed

« back to all changes in this revision

Viewing changes to ark/part/archivemodel.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Jonathan Thomas
  • Date: 2010-02-28 11:30:24 UTC
  • mfrom: (1.2.41 upstream)
  • Revision ID: james.westby@ubuntu.com-20100228113024-o11z0lf8ertqublf
Tags: 4:4.4.1-0ubuntu1
https://launchpad.net/bugs/521061
* New upstream bugfix release:
  - Bump build-depend versions
  - Update kdelirc.install, printer-applet.install and okteta.install
* Backport svn revision 1089254 (LP: #521061)

Show diffs side-by-side

added added

removed removed

Lines of Context:
ark/part/archivemodel.cpp
551
551
{
552
552
    QString cleanName(fileName);
553
553
 
554
 
    if (cleanName.startsWith(QLatin1String("./"))) {
 
554
    if (cleanName == ".") { // "." is present in ISO files
 
555
        cleanName.clear();
 
556
    } else if (cleanName.startsWith(QLatin1String("./"))) {
555
557
        cleanName.remove(0, 2);
556
558
    }
557
559
 
718
720
 
719
721
    //#194241: Filenames such as "./file" should be displayed as "file"
720
722
    QString entryFileName = cleanFileName(entry[FileName].toString());
721
 
    if (entryFileName.isEmpty()) { // The entry contains only "./"
 
723
    if (entryFileName.isEmpty()) { // The entry contains only "." or "./"
722
724
        return;
723
725
    }
724
726
    entry[FileName] = entryFileName;