summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/net/mailit/emailhandler.cpp13
-rw-r--r--noncore/unsupported/mailit/emailhandler.cpp13
2 files changed, 2 insertions, 24 deletions
diff --git a/noncore/net/mailit/emailhandler.cpp b/noncore/net/mailit/emailhandler.cpp
index c7b27a0..62fa64f 100644
--- a/noncore/net/mailit/emailhandler.cpp
+++ b/noncore/net/mailit/emailhandler.cpp
@@ -197,40 +197,29 @@ bool EmailHandler::parse(QString in, QString lineShift, Email *mail)
mail->fromMail.truncate(mail->fromMail.length() - 1);
mail->from=mail->fromMail;
}
}
pos=0;
//Search for To: after the FROM: attribute to prevent hitting the Delivered-To:
while((pos = p.find("TO",':', pos+1, TRUE))!=-1)
{
QString rec;
- if (p.separatorAt(pos-1)!='-')
+ if (p.separatorAt(pos-1)!='-') //The - separator means that this is a Delivered-To: or Reply-To:
{
pos++;
mail->recipients.append(p.getString(&pos, '\r', TRUE));
}
- /*else {
- if ((p.separatorAt(pos) == '<')|| (p.separatorAt(pos) == ' ')) //No name.. nasty
- pos++;
- pos++;
- mail->fromMail = p.getString(&pos, 'z', TRUE);
- if (mail->fromMail.at(mail->fromMail.length()-1) == '>')
- mail->fromMail.truncate(mail->fromMail.length() - 1);
- mail->from=mail->fromMail;
- }
- mail->recipients.append (p.getString(&pos, 'z', TRUE) );
- }*/
}
//
//if (pos==-1) mail->recipients.append (tr("undisclosed recipients") );
if ((pos = p.find("CC",':', 0, TRUE)) != -1)
{
pos++;
mail->carbonCopies.append (p.getString(&pos, 'z', TRUE) );
}
if ((pos = p.find("SUBJECT",':', 0, TRUE)) != -1) {
pos++;
diff --git a/noncore/unsupported/mailit/emailhandler.cpp b/noncore/unsupported/mailit/emailhandler.cpp
index c7b27a0..62fa64f 100644
--- a/noncore/unsupported/mailit/emailhandler.cpp
+++ b/noncore/unsupported/mailit/emailhandler.cpp
@@ -197,40 +197,29 @@ bool EmailHandler::parse(QString in, QString lineShift, Email *mail)
mail->fromMail.truncate(mail->fromMail.length() - 1);
mail->from=mail->fromMail;
}
}
pos=0;
//Search for To: after the FROM: attribute to prevent hitting the Delivered-To:
while((pos = p.find("TO",':', pos+1, TRUE))!=-1)
{
QString rec;
- if (p.separatorAt(pos-1)!='-')
+ if (p.separatorAt(pos-1)!='-') //The - separator means that this is a Delivered-To: or Reply-To:
{
pos++;
mail->recipients.append(p.getString(&pos, '\r', TRUE));
}
- /*else {
- if ((p.separatorAt(pos) == '<')|| (p.separatorAt(pos) == ' ')) //No name.. nasty
- pos++;
- pos++;
- mail->fromMail = p.getString(&pos, 'z', TRUE);
- if (mail->fromMail.at(mail->fromMail.length()-1) == '>')
- mail->fromMail.truncate(mail->fromMail.length() - 1);
- mail->from=mail->fromMail;
- }
- mail->recipients.append (p.getString(&pos, 'z', TRUE) );
- }*/
}
//
//if (pos==-1) mail->recipients.append (tr("undisclosed recipients") );
if ((pos = p.find("CC",':', 0, TRUE)) != -1)
{
pos++;
mail->carbonCopies.append (p.getString(&pos, 'z', TRUE) );
}
if ((pos = p.find("SUBJECT",':', 0, TRUE)) != -1) {
pos++;