Merged revisions 1075167 via svnmerge from 
svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim

........
  r1075167 | tmcguire | 2010-01-15 17:10:22 +0100 (Fri, 15 Jan 2010) | 7 lines
  
  When reading the filename of a part, don't fallback to the message charset.
  This is wrong, and will especially fail on codecs that don't map their lower 7
  bits to ascii, like utf16.
  
  kolab/issue4030
  MERGE: e4, trunk (?, needs to be tested)
........

svn path=/branches/kdepim/enterprise4/kdepim/; revision=1075205
wilder-work
Thomas McGuire 16 years ago
parent f9f96f94db
commit 125555ab7b
  1. 2
      kmmsgpart.cpp

@ -453,7 +453,7 @@ QString KMMessagePart::fileName( void ) const
if ( bRFC2231encoded ) {
return KMMsgBase::decodeRFC2231String( str );
} else {
return KMMsgBase::decodeRFC2047String( str, charset() );
return KMMsgBase::decodeRFC2047String( str );
}
}

Loading…
Cancel
Save