summaryrefslogtreecommitdiff
path: root/noncore/unsupported/mailit/emailhandler.cpp
Unidiff
Diffstat (limited to 'noncore/unsupported/mailit/emailhandler.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/unsupported/mailit/emailhandler.cpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/noncore/unsupported/mailit/emailhandler.cpp b/noncore/unsupported/mailit/emailhandler.cpp
index b180051..fbbada7 100644
--- a/noncore/unsupported/mailit/emailhandler.cpp
+++ b/noncore/unsupported/mailit/emailhandler.cpp
@@ -122,28 +122,30 @@ void EmailHandler::getMailByList(MailList *mailList)
122{ 122{
123 if (mailList->count() == 0) { //should not occur though 123 if (mailList->count() == 0) { //should not occur though
124 emit mailTransfered(0); 124 emit mailTransfered(0);
125 return; 125 return;
126 } 126 }
127 127
128 headers = FALSE; 128 headers = FALSE;
129 popClient->headersOnly(FALSE, 0); 129 popClient->headersOnly(FALSE, 0);
130 popClient->newConnection(mailAccount.popServer, 110); 130
131 popClient->setAccount(mailAccount.popUserName,mailAccount.popPasswd);
131 popClient->setSelectedMails(mailList); 132 popClient->setSelectedMails(mailList);
132} 133 popClient->newConnection(mailAccount.popServer, 110);
134 }
133 135
134void EmailHandler::messageArrived(const QString &message, int id, uint size, bool incomplete) 136void EmailHandler::messageArrived(const QString &message, int id, uint size, bool complete)
135{ 137{
136 Email mail; 138 Email mail;
137 139
138 mail.rawMail = message; 140 mail.rawMail = message;
139 mail.serverId = id; 141 mail.serverId = id;
140 mail.size = size; 142 mail.size = size;
141 mail.downloaded = incomplete; 143 mail.downloaded = complete;
142 144
143 emit mailArrived(mail, FALSE); 145 emit mailArrived(mail, FALSE);
144} 146}
145 147
146bool EmailHandler::parse(QString in, QString lineShift, Email *mail) 148bool EmailHandler::parse(QString in, QString lineShift, Email *mail)
147{ 149{
148 QString temp, boundary; 150 QString temp, boundary;
149 int pos; 151 int pos;
@@ -177,23 +179,21 @@ bool EmailHandler::parse(QString in, QString lineShift, Email *mail)
177 if (p.separatorAt(pos) == ' ') { 179 if (p.separatorAt(pos) == ' ') {
178 mail->from = p.getString(&pos, '<', false); 180 mail->from = p.getString(&pos, '<', false);
179 mail->from = mail->from.stripWhiteSpace(); 181 mail->from = mail->from.stripWhiteSpace();
180 if ( (mail->from.length() > 2) && (mail->from[0] == '"') ) { 182 if ( (mail->from.length() > 2) && (mail->from[0] == '"') ) {
181 mail->from = mail->from.left(mail->from.length() - 1); 183 mail->from = mail->from.left(mail->from.length() - 1);
182 mail->from = mail->from.right(mail->from.length() - 1); 184 mail->from = mail->from.right(mail->from.length() - 1);
183 } 185 }
184 pos++; 186 pos++;
185
186 mail->fromMail = p.getString(&pos, '>', false); 187 mail->fromMail = p.getString(&pos, '>', false);
187 } else { 188 } else {
188 if ((p.separatorAt(pos) == '<') 189 if (p.separatorAt(pos) == '<') //No name.. nasty
189 || (p.separatorAt(pos) == ' ')) //No name.. nasty
190 pos++;
191 pos++; 190 pos++;
191 //pos++;
192 mail->fromMail = p.getString(&pos, 'z', TRUE); 192 mail->fromMail = p.getString(&pos, 'z', TRUE);
193 if (mail->fromMail.at(mail->fromMail.length()-1) == '>') 193 if (mail->fromMail.at(mail->fromMail.length()-1) == '>')
194 mail->fromMail.truncate(mail->fromMail.length() - 1); 194 mail->fromMail.truncate(mail->fromMail.length() - 1);
195 mail->from=mail->fromMail; 195 mail->from=mail->fromMail;
196 } 196 }
197 } 197 }
198 198
199 pos=0; 199 pos=0;