Diffstat (limited to 'noncore/net/mail/libmailwrapper/genericwrapper.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/net/mail/libmailwrapper/genericwrapper.cpp | 47 |
1 files changed, 38 insertions, 9 deletions
diff --git a/noncore/net/mail/libmailwrapper/genericwrapper.cpp b/noncore/net/mail/libmailwrapper/genericwrapper.cpp index bef6ae5..5de9299 100644 --- a/noncore/net/mail/libmailwrapper/genericwrapper.cpp +++ b/noncore/net/mail/libmailwrapper/genericwrapper.cpp | |||
@@ -125,3 +125,3 @@ QString Genericwrapper::getencoding(mailmime_mechanism*aEnc) | |||
125 | 125 | ||
126 | void Genericwrapper::traverseBody(RecBody&target,mailmessage*message,mailmime*mime,unsigned int current_rec) | 126 | void Genericwrapper::traverseBody(RecBody&target,mailmessage*message,mailmime*mime,QValueList<int>recList,unsigned int current_rec,int current_count) |
127 | { | 127 | { |
@@ -140,6 +140,14 @@ void Genericwrapper::traverseBody(RecBody&target,mailmessage*message,mailmime*mi | |||
140 | 140 | ||
141 | //current_count; | ||
142 | |||
141 | switch (mime->mm_type) { | 143 | switch (mime->mm_type) { |
142 | case MAILMIME_SINGLE: | 144 | case MAILMIME_SINGLE: |
145 | { | ||
146 | QValueList<int>countlist = recList; | ||
147 | countlist.append(current_count); | ||
143 | r = mailmessage_fetch_section(message,mime,&data,&len); | 148 | r = mailmessage_fetch_section(message,mime,&data,&len); |
144 | part.setSize(len); | 149 | part.setSize(len); |
150 | part.setPositionlist(countlist); | ||
151 | b = gen_attachment_id(); | ||
152 | part.setIdentifier(b); | ||
145 | fillSingleBody(part,message,mime); | 153 | fillSingleBody(part,message,mime); |
@@ -155,4 +163,2 @@ void Genericwrapper::traverseBody(RecBody&target,mailmessage*message,mailmime*mi | |||
155 | } else { | 163 | } else { |
156 | b = gen_attachment_id(); | ||
157 | part.setIdentifier(b); | ||
158 | bodyCache[b]=new encodedString(data,len); | 164 | bodyCache[b]=new encodedString(data,len); |
@@ -160,13 +166,35 @@ void Genericwrapper::traverseBody(RecBody&target,mailmessage*message,mailmime*mi | |||
160 | } | 166 | } |
161 | break; | 167 | } |
168 | break; | ||
162 | case MAILMIME_MULTIPLE: | 169 | case MAILMIME_MULTIPLE: |
170 | { | ||
171 | unsigned int ccount = current_count; | ||
163 | for (cur = clist_begin(mime->mm_data.mm_multipart.mm_mp_list) ; cur != NULL ; cur = clist_next(cur)) { | 172 | for (cur = clist_begin(mime->mm_data.mm_multipart.mm_mp_list) ; cur != NULL ; cur = clist_next(cur)) { |
164 | traverseBody(target,message, (mailmime*)clist_content(cur),current_rec+1); | 173 | traverseBody(target,message, (mailmime*)clist_content(cur),recList,current_rec+1,ccount); |
174 | ++ccount; | ||
165 | } | 175 | } |
166 | break; | 176 | } |
177 | break; | ||
167 | case MAILMIME_MESSAGE: | 178 | case MAILMIME_MESSAGE: |
179 | { | ||
180 | QValueList<int>countlist = recList; | ||
181 | countlist.append(current_count); | ||
182 | /* the own header is always at recursion 0 - we don't need that */ | ||
183 | if (current_rec > 0) { | ||
184 | part.setPositionlist(countlist); | ||
185 | r = mailmessage_fetch_section(message,mime,&data,&len); | ||
186 | part.setSize(len); | ||
187 | part.setPositionlist(countlist); | ||
188 | b = gen_attachment_id(); | ||
189 | part.setIdentifier(b); | ||
190 | part.setType("message"); | ||
191 | part.setSubtype("rfc822"); | ||
192 | bodyCache[b]=new encodedString(data,len); | ||
193 | target.addPart(part); | ||
194 | } | ||
168 | if (mime->mm_data.mm_message.mm_msg_mime != NULL) { | 195 | if (mime->mm_data.mm_message.mm_msg_mime != NULL) { |
169 | traverseBody(target,message,mime->mm_data.mm_message.mm_msg_mime,current_rec+1); | 196 | traverseBody(target,message,mime->mm_data.mm_message.mm_msg_mime,countlist,current_rec+1); |
170 | } | 197 | } |
171 | break; | 198 | } |
199 | break; | ||
172 | } | 200 | } |
@@ -183,3 +211,4 @@ RecBody Genericwrapper::parseMail( mailmessage * msg ) | |||
183 | err = mailmessage_get_bodystructure(msg,&mime); | 211 | err = mailmessage_get_bodystructure(msg,&mime); |
184 | traverseBody(body,msg,mime); | 212 | QValueList<int>recList; |
213 | traverseBody(body,msg,mime,recList); | ||
185 | return body; | 214 | return body; |