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

List:       kde-commits
Subject:    branches/KDE/4.1/kdepim/kaddressbook/xxport
From:       Thomas McGuire <mcguire () kde ! org>
Date:       2009-01-03 15:12:18
Message-ID: 1230995538.058328.1362.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 904945 by tmcguire:

Backport r904918 by tmcguire from trunk to the 4.1 branch:

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

........
  r900706 | vkrause | 2008-12-23 13:59:08 +0100 (Tue, 23 Dec 2008) | 4 lines
  
  Fix LDIF import for files with windows linebreaks (CRLF). This probably
  should be fixed in the LDIF parser in the first place (CRLF is a valid
  linebreak according to RFC 2849), but it's much easier this way.
........



 M  +1 -1      ldif_xxport.cpp  


--- branches/KDE/4.1/kdepim/kaddressbook/xxport/ldif_xxport.cpp #904944:904945
@@ -71,7 +71,7 @@
     return addrList;
 
   QFile file( fileName );
-  if ( !file.open( QIODevice::ReadOnly ) ) {
+  if ( !file.open( QIODevice::ReadOnly | QIODevice::Text ) ) {
     QString msg = i18n( "<qt>Unable to open <b>%1</b> for reading.</qt>", fileName );
     KMessageBox::error( parentWidget(), msg );
     return addrList;
[prev in list] [next in list] [prev in thread] [next in thread]