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

List:       kde-commits
Subject:    branches/KDE/3.5/kdepim/korn
From:       Mart Kelder <mart.kde () hccnet ! nl>
Date:       2005-10-08 19:42:36
Message-ID: 1128800556.010488.11923.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 468629 by mkelder:


In some cases, the emails warn't parsed correctly; this should fix that.


 M  +10 -5     kio_single_subject.cpp  


--- branches/KDE/3.5/kdepim/korn/kio_single_subject.cpp #468628:468629
@@ -86,30 +86,35 @@
 	QRegExp rx_subject( "^[sS]ubject: " ); //Ex: Subject: ...
 	QRegExp rx_date  ( "^[dD]ate: ");
 	bool inheader = true;
-	bool firstLine = true;
+	int fieldnumber = 0;
+
 	while ( ! stream.atEnd() )
 	{
 		line = stream.readLine();
-		if( line.isEmpty() && ! firstLine )
+		if( line.isEmpty() && fieldnumber >= 2 )
 			inheader = false;
 		
-		if( firstLine && !line.isEmpty() )
-			firstLine = false;
-	
 		if( inheader )
 		{
 			if( rx_sender.search( line ) == 0 )
+			{
 				if( rx_sender_has_name1.search( line ) == 0 )
 					subject->setSender( rx_sender_has_name1.cap( 1 )  );
 				else if(rx_sender_has_name2.search( line ) == 0)
 					subject->setSender( rx_sender_has_name2.cap( 1 ) );
 				else
 					subject->setSender( line.remove( rx_sender ) );
+				++fieldnumber;
+			}
 			else if( rx_subject.search( line ) == 0 )
+			{
 				subject->setSubject( line.remove( rx_subject ) );
+				++fieldnumber;
+			}
 			else if( rx_date.search( line ) == 0 )
 			{
 				subject->setDate( KRFCDate::parseDate( line.right( line.length() - 6 ) ) );
+				++fieldnumber;
 			}
 		}
 	}
[prev in list] [next in list] [prev in thread] [next in thread]