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

List:       kde-commits
Subject:    branches/KDE/4.3/kdepim/kmail
From:       Martin Koller <kollix () aon ! at>
Date:       2009-09-04 23:27:17
Message-ID: 1252106837.639522.16275.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1019990 by mkoller:

Backport bug 191455

Replace dir-delimiters with _ char onm saving attachments



 M  +8 -0      kmcommands.cpp  


--- branches/KDE/4.3/kdepim/kmail/kmcommands.cpp #1019989:1019990
@@ -2441,6 +2441,10 @@
       s = node->msgPart().name().trimmed().replace( ':', '_' );
     if ( s.isEmpty() )
       s = i18nc("filename for an unnamed attachment", "attachment.1");
+    else {  // better not use a dir-delimiter in a filename
+      s = s.replace( '/', '_' );
+      s = s.replace( '\\', '_' );
+    }
     url = KFileDialog::getSaveUrl( KUrl( "kfiledialog:///saveAttachment/" + s ),
                                    QString(),
                                    parentWidget(),
@@ -2474,6 +2478,10 @@
                  "attachment.%1",
               unnamedAtmCount );
       }
+      else {  // better not use a dir-delimiter in a filename
+        s = s.replace( '/', '_' );
+        s = s.replace( '\\', '_' );
+      }
       curUrl.setFileName( s );
     } else {
       curUrl = url;
[prev in list] [next in list] [prev in thread] [next in thread]