author | mickeyl <mickeyl> | 2004-04-04 13:54:40 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2004-04-04 13:54:40 (UTC) |
commit | 16cf79e90b5217f8d4bfce2a0fa817ae4b73db36 (patch) (unidiff) | |
tree | 0701eae15aa606a0211a2fccfde0eafdac69357c /noncore/net/mail/libmailwrapper | |
parent | 8d2d2664e5f544b8292806e617deb7a0e4170dc0 (diff) | |
download | opie-16cf79e90b5217f8d4bfce2a0fa817ae4b73db36.zip opie-16cf79e90b5217f8d4bfce2a0fa817ae4b73db36.tar.gz opie-16cf79e90b5217f8d4bfce2a0fa817ae4b73db36.tar.bz2 |
convert to Opie Debugging Framework
Diffstat (limited to 'noncore/net/mail/libmailwrapper') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/net/mail/libmailwrapper/abstractmail.cpp | 8 | ||||
-rw-r--r-- | noncore/net/mail/libmailwrapper/generatemail.cpp | 30 | ||||
-rw-r--r-- | noncore/net/mail/libmailwrapper/genericwrapper.cpp | 14 | ||||
-rw-r--r-- | noncore/net/mail/libmailwrapper/imapwrapper.cpp | 66 | ||||
-rw-r--r-- | noncore/net/mail/libmailwrapper/logindialog.cpp | 2 | ||||
-rw-r--r-- | noncore/net/mail/libmailwrapper/mailtypes.cpp | 10 | ||||
-rw-r--r-- | noncore/net/mail/libmailwrapper/mailwrapper.cpp | 2 | ||||
-rw-r--r-- | noncore/net/mail/libmailwrapper/mboxwrapper.cpp | 22 | ||||
-rw-r--r-- | noncore/net/mail/libmailwrapper/mhwrapper.cpp | 60 | ||||
-rw-r--r-- | noncore/net/mail/libmailwrapper/nntpwrapper.cpp | 8 | ||||
-rw-r--r-- | noncore/net/mail/libmailwrapper/pop3wrapper.cpp | 10 | ||||
-rw-r--r-- | noncore/net/mail/libmailwrapper/settings.cpp | 18 | ||||
-rw-r--r-- | noncore/net/mail/libmailwrapper/smtpwrapper.cpp | 30 | ||||
-rw-r--r-- | noncore/net/mail/libmailwrapper/statusmail.cpp | 6 | ||||
-rw-r--r-- | noncore/net/mail/libmailwrapper/storemail.cpp | 4 |
15 files changed, 145 insertions, 145 deletions
diff --git a/noncore/net/mail/libmailwrapper/abstractmail.cpp b/noncore/net/mail/libmailwrapper/abstractmail.cpp index 6bebb7b..1a26351 100644 --- a/noncore/net/mail/libmailwrapper/abstractmail.cpp +++ b/noncore/net/mail/libmailwrapper/abstractmail.cpp | |||
@@ -43,67 +43,67 @@ AbstractMail* AbstractMail::getWrapper(Account*a) | |||
43 | return new POP3wrapper((POP3account*)a); | 43 | return new POP3wrapper((POP3account*)a); |
44 | break; | 44 | break; |
45 | case MAILLIB::A_NNTP: | 45 | case MAILLIB::A_NNTP: |
46 | return new NNTPwrapper((NNTPaccount*)a); | 46 | return new NNTPwrapper((NNTPaccount*)a); |
47 | break; | 47 | break; |
48 | default: | 48 | default: |
49 | return 0; | 49 | return 0; |
50 | } | 50 | } |
51 | } | 51 | } |
52 | 52 | ||
53 | encodedString* AbstractMail::decode_String(const encodedString*text,const QString&enc) | 53 | encodedString* AbstractMail::decode_String(const encodedString*text,const QString&enc) |
54 | { | 54 | { |
55 | qDebug("Decode string start"); | 55 | odebug << "Decode string start" << oendl; |
56 | char*result_text; | 56 | char*result_text; |
57 | size_t index = 0; | 57 | size_t index = 0; |
58 | /* reset for recursive use! */ | 58 | /* reset for recursive use! */ |
59 | size_t target_length = 0; | 59 | size_t target_length = 0; |
60 | result_text = 0; | 60 | result_text = 0; |
61 | int mimetype = MAILMIME_MECHANISM_7BIT; | 61 | int mimetype = MAILMIME_MECHANISM_7BIT; |
62 | if (enc.lower()=="quoted-printable") { | 62 | if (enc.lower()=="quoted-printable") { |
63 | mimetype = MAILMIME_MECHANISM_QUOTED_PRINTABLE; | 63 | mimetype = MAILMIME_MECHANISM_QUOTED_PRINTABLE; |
64 | } else if (enc.lower()=="base64") { | 64 | } else if (enc.lower()=="base64") { |
65 | mimetype = MAILMIME_MECHANISM_BASE64; | 65 | mimetype = MAILMIME_MECHANISM_BASE64; |
66 | } else if (enc.lower()=="8bit") { | 66 | } else if (enc.lower()=="8bit") { |
67 | mimetype = MAILMIME_MECHANISM_8BIT; | 67 | mimetype = MAILMIME_MECHANISM_8BIT; |
68 | } else if (enc.lower()=="binary") { | 68 | } else if (enc.lower()=="binary") { |
69 | mimetype = MAILMIME_MECHANISM_BINARY; | 69 | mimetype = MAILMIME_MECHANISM_BINARY; |
70 | } | 70 | } |
71 | 71 | ||
72 | int err = mailmime_part_parse(text->Content(),text->Length(),&index,mimetype, | 72 | int err = mailmime_part_parse(text->Content(),text->Length(),&index,mimetype, |
73 | &result_text,&target_length); | 73 | &result_text,&target_length); |
74 | 74 | ||
75 | encodedString* result = new encodedString(); | 75 | encodedString* result = new encodedString(); |
76 | if (err == MAILIMF_NO_ERROR) { | 76 | if (err == MAILIMF_NO_ERROR) { |
77 | result->setContent(result_text,target_length); | 77 | result->setContent(result_text,target_length); |
78 | } | 78 | } |
79 | qDebug("Decode string finished"); | 79 | odebug << "Decode string finished" << oendl; |
80 | return result; | 80 | return result; |
81 | } | 81 | } |
82 | 82 | ||
83 | QString AbstractMail::convert_String(const char*text) | 83 | QString AbstractMail::convert_String(const char*text) |
84 | { | 84 | { |
85 | //size_t index = 0; | 85 | //size_t index = 0; |
86 | char*res = 0; | 86 | char*res = 0; |
87 | int err = MAILIMF_NO_ERROR; | 87 | int err = MAILIMF_NO_ERROR; |
88 | 88 | ||
89 | QString result(text); | 89 | QString result(text); |
90 | 90 | ||
91 | /* due a bug in libetpan it isn't usable this moment */ | 91 | /* due a bug in libetpan it isn't usable this moment */ |
92 | /* int err = mailmime_encoded_phrase_parse("iso-8859-1", | 92 | /* int err = mailmime_encoded_phrase_parse("iso-8859-1", |
93 | text, strlen(text),&index, "iso-8859-1",&res);*/ | 93 | text, strlen(text),&index, "iso-8859-1",&res);*/ |
94 | //qDebug("Input: %s",text); | 94 | //odebug << "Input: " << text << "" << oendl; |
95 | if (err == MAILIMF_NO_ERROR && res && strlen(res)) { | 95 | if (err == MAILIMF_NO_ERROR && res && strlen(res)) { |
96 | // result = QString(res); | 96 | // result = QString(res); |
97 | // qDebug("Res: %s, length: %i",res,strlen(res)); | 97 | // odebug << "Res: " << res << ", length: " << strlen(res) << "" << oendl; |
98 | } | 98 | } |
99 | if (res) free(res); | 99 | if (res) free(res); |
100 | return result; | 100 | return result; |
101 | } | 101 | } |
102 | 102 | ||
103 | /* cp & paste from launcher */ | 103 | /* cp & paste from launcher */ |
104 | QString AbstractMail::gen_attachment_id() | 104 | QString AbstractMail::gen_attachment_id() |
105 | { | 105 | { |
106 | QFile file( "/proc/sys/kernel/random/uuid" ); | 106 | QFile file( "/proc/sys/kernel/random/uuid" ); |
107 | if (!file.open(IO_ReadOnly ) ) | 107 | if (!file.open(IO_ReadOnly ) ) |
108 | return QString::null; | 108 | return QString::null; |
109 | 109 | ||
diff --git a/noncore/net/mail/libmailwrapper/generatemail.cpp b/noncore/net/mail/libmailwrapper/generatemail.cpp index cb58d82..36ec232 100644 --- a/noncore/net/mail/libmailwrapper/generatemail.cpp +++ b/noncore/net/mail/libmailwrapper/generatemail.cpp | |||
@@ -88,47 +88,47 @@ mailimf_address_list *Generatemail::parseAddresses(const QString&addr ) { | |||
88 | QString s; | 88 | QString s; |
89 | unsigned int i = 0; | 89 | unsigned int i = 0; |
90 | for (; i < addr.length();++i) { | 90 | for (; i < addr.length();++i) { |
91 | switch (addr[i]) { | 91 | switch (addr[i]) { |
92 | case '\"': | 92 | case '\"': |
93 | literal_open = !literal_open; | 93 | literal_open = !literal_open; |
94 | break; | 94 | break; |
95 | case ',': | 95 | case ',': |
96 | if (!literal_open) { | 96 | if (!literal_open) { |
97 | s = addr.mid(startpos,i-startpos); | 97 | s = addr.mid(startpos,i-startpos); |
98 | if (!s.isEmpty()) { | 98 | if (!s.isEmpty()) { |
99 | list.append(s); | 99 | list.append(s); |
100 | qDebug("Appended %s",s.latin1()); | 100 | odebug << "Appended " << s.latin1() << "" << oendl; |
101 | } | 101 | } |
102 | // !!!! this is a MUST BE! | 102 | // !!!! this is a MUST BE! |
103 | startpos = ++i; | 103 | startpos = ++i; |
104 | } | 104 | } |
105 | break; | 105 | break; |
106 | default: | 106 | default: |
107 | break; | 107 | break; |
108 | } | 108 | } |
109 | } | 109 | } |
110 | s = addr.mid(startpos,i-startpos); | 110 | s = addr.mid(startpos,i-startpos); |
111 | if (!s.isEmpty()) { | 111 | if (!s.isEmpty()) { |
112 | list.append(s); | 112 | list.append(s); |
113 | qDebug("Appended %s",s.latin1()); | 113 | odebug << "Appended " << s.latin1() << "" << oendl; |
114 | } | 114 | } |
115 | QStringList::Iterator it; | 115 | QStringList::Iterator it; |
116 | for ( it = list.begin(); it != list.end(); it++ ) { | 116 | for ( it = list.begin(); it != list.end(); it++ ) { |
117 | int err = mailimf_address_list_add_parse( addresses, (char*)(*it).latin1() ); | 117 | int err = mailimf_address_list_add_parse( addresses, (char*)(*it).latin1() ); |
118 | if ( err != MAILIMF_NO_ERROR ) { | 118 | if ( err != MAILIMF_NO_ERROR ) { |
119 | qDebug( "Error parsing" ); | 119 | odebug << "Error parsing" << oendl; |
120 | qDebug( *it ); | 120 | odebug << *it << oendl; |
121 | } else { | 121 | } else { |
122 | qDebug( "Parse success! %s",(*it).latin1()); | 122 | odebug << "Parse success! " << (*it).latin1() << "" << oendl; |
123 | } | 123 | } |
124 | } | 124 | } |
125 | return addresses; | 125 | return addresses; |
126 | } | 126 | } |
127 | 127 | ||
128 | mailmime *Generatemail::buildFilePart(const QString&filename,const QString&mimetype,const QString&TextContent ) { | 128 | mailmime *Generatemail::buildFilePart(const QString&filename,const QString&mimetype,const QString&TextContent ) { |
129 | mailmime * filePart = 0; | 129 | mailmime * filePart = 0; |
130 | mailmime_fields * fields = 0; | 130 | mailmime_fields * fields = 0; |
131 | mailmime_content * content = 0; | 131 | mailmime_content * content = 0; |
132 | mailmime_parameter * param = 0; | 132 | mailmime_parameter * param = 0; |
133 | char*name = 0; | 133 | char*name = 0; |
134 | char*file = 0; | 134 | char*file = 0; |
@@ -166,25 +166,25 @@ mailmime *Generatemail::buildFilePart(const QString&filename,const QString&mimet | |||
166 | clist_append(content->ct_parameters,param); | 166 | clist_append(content->ct_parameters,param); |
167 | param = 0; | 167 | param = 0; |
168 | } | 168 | } |
169 | filePart = mailmime_new_empty( content, fields ); | 169 | filePart = mailmime_new_empty( content, fields ); |
170 | } | 170 | } |
171 | if (filePart) { | 171 | if (filePart) { |
172 | if (filename.length()>0) { | 172 | if (filename.length()>0) { |
173 | err = mailmime_set_body_file( filePart, file ); | 173 | err = mailmime_set_body_file( filePart, file ); |
174 | } else { | 174 | } else { |
175 | err = mailmime_set_body_text(filePart,strdup(TextContent.data()),TextContent.length()); | 175 | err = mailmime_set_body_text(filePart,strdup(TextContent.data()),TextContent.length()); |
176 | } | 176 | } |
177 | if (err != MAILIMF_NO_ERROR) { | 177 | if (err != MAILIMF_NO_ERROR) { |
178 | qDebug("Error setting body with file %s",file); | 178 | odebug << "Error setting body with file " << file << "" << oendl; |
179 | mailmime_free( filePart ); | 179 | mailmime_free( filePart ); |
180 | filePart = 0; | 180 | filePart = 0; |
181 | } | 181 | } |
182 | } | 182 | } |
183 | 183 | ||
184 | if (!filePart) { | 184 | if (!filePart) { |
185 | if ( param != NULL ) { | 185 | if ( param != NULL ) { |
186 | mailmime_parameter_free( param ); | 186 | mailmime_parameter_free( param ); |
187 | } | 187 | } |
188 | if (content) { | 188 | if (content) { |
189 | mailmime_content_free( content ); | 189 | mailmime_content_free( content ); |
190 | } | 190 | } |
@@ -197,41 +197,41 @@ mailmime *Generatemail::buildFilePart(const QString&filename,const QString&mimet | |||
197 | if (file) { | 197 | if (file) { |
198 | free( file ); | 198 | free( file ); |
199 | } | 199 | } |
200 | } | 200 | } |
201 | } | 201 | } |
202 | return filePart; // Success :) | 202 | return filePart; // Success :) |
203 | 203 | ||
204 | } | 204 | } |
205 | 205 | ||
206 | void Generatemail::addFileParts( mailmime *message,const QList<Attachment>&files ) { | 206 | void Generatemail::addFileParts( mailmime *message,const QList<Attachment>&files ) { |
207 | const Attachment *it; | 207 | const Attachment *it; |
208 | unsigned int count = files.count(); | 208 | unsigned int count = files.count(); |
209 | qDebug("List contains %i values",count); | 209 | odebug << "List contains " << count << " values" << oendl; |
210 | for ( unsigned int i = 0; i < count; ++i ) { | 210 | for ( unsigned int i = 0; i < count; ++i ) { |
211 | qDebug( "Adding file" ); | 211 | odebug << "Adding file" << oendl; |
212 | mailmime *filePart; | 212 | mailmime *filePart; |
213 | int err; | 213 | int err; |
214 | it = ((QList<Attachment>)files).at(i); | 214 | it = ((QList<Attachment>)files).at(i); |
215 | 215 | ||
216 | filePart = buildFilePart( it->getFileName(), it->getMimeType(),"" ); | 216 | filePart = buildFilePart( it->getFileName(), it->getMimeType(),"" ); |
217 | if ( filePart == NULL ) { | 217 | if ( filePart == NULL ) { |
218 | qDebug( "addFileParts: error adding file:" ); | 218 | odebug << "addFileParts: error adding file:" << oendl; |
219 | qDebug( it->getFileName() ); | 219 | odebug << it->getFileName() << oendl; |
220 | continue; | 220 | continue; |
221 | } | 221 | } |
222 | err = mailmime_smart_add_part( message, filePart ); | 222 | err = mailmime_smart_add_part( message, filePart ); |
223 | if ( err != MAILIMF_NO_ERROR ) { | 223 | if ( err != MAILIMF_NO_ERROR ) { |
224 | mailmime_free( filePart ); | 224 | mailmime_free( filePart ); |
225 | qDebug("error smart add"); | 225 | odebug << "error smart add" << oendl; |
226 | } | 226 | } |
227 | } | 227 | } |
228 | } | 228 | } |
229 | 229 | ||
230 | mailmime *Generatemail::buildTxtPart(const QString&str ) { | 230 | mailmime *Generatemail::buildTxtPart(const QString&str ) { |
231 | mailmime *txtPart; | 231 | mailmime *txtPart; |
232 | mailmime_fields *fields; | 232 | mailmime_fields *fields; |
233 | mailmime_content *content; | 233 | mailmime_content *content; |
234 | mailmime_parameter *param; | 234 | mailmime_parameter *param; |
235 | int err; | 235 | int err; |
236 | 236 | ||
237 | param = mailmime_parameter_new( strdup( "charset" ), | 237 | param = mailmime_parameter_new( strdup( "charset" ), |
@@ -261,25 +261,25 @@ mailmime *Generatemail::buildTxtPart(const QString&str ) { | |||
261 | 261 | ||
262 | return txtPart; // Success :) | 262 | return txtPart; // Success :) |
263 | 263 | ||
264 | err_free_txtPart: | 264 | err_free_txtPart: |
265 | mailmime_free( txtPart ); | 265 | mailmime_free( txtPart ); |
266 | err_free_fields: | 266 | err_free_fields: |
267 | mailmime_fields_free( fields ); | 267 | mailmime_fields_free( fields ); |
268 | err_free_content: | 268 | err_free_content: |
269 | mailmime_content_free( content ); | 269 | mailmime_content_free( content ); |
270 | err_free_param: | 270 | err_free_param: |
271 | mailmime_parameter_free( param ); | 271 | mailmime_parameter_free( param ); |
272 | err_free: | 272 | err_free: |
273 | qDebug( "buildTxtPart - error" ); | 273 | odebug << "buildTxtPart - error" << oendl; |
274 | 274 | ||
275 | return NULL; // Error :( | 275 | return NULL; // Error :( |
276 | } | 276 | } |
277 | 277 | ||
278 | mailimf_mailbox *Generatemail::newMailbox(const QString&name, const QString&mail ) { | 278 | mailimf_mailbox *Generatemail::newMailbox(const QString&name, const QString&mail ) { |
279 | return mailimf_mailbox_new( strdup( name.latin1() ), | 279 | return mailimf_mailbox_new( strdup( name.latin1() ), |
280 | strdup( mail.latin1() ) ); | 280 | strdup( mail.latin1() ) ); |
281 | } | 281 | } |
282 | 282 | ||
283 | mailimf_fields *Generatemail::createImfFields(const Opie::Core::OSmartPointer<Mail>&mail ) | 283 | mailimf_fields *Generatemail::createImfFields(const Opie::Core::OSmartPointer<Mail>&mail ) |
284 | { | 284 | { |
285 | mailimf_fields *fields = NULL; | 285 | mailimf_fields *fields = NULL; |
@@ -336,33 +336,33 @@ mailimf_fields *Generatemail::createImfFields(const Opie::Core::OSmartPointer<Ma | |||
336 | h.remove(0,1); | 336 | h.remove(0,1); |
337 | } | 337 | } |
338 | while (h.length()>0 && h[h.length()-1]=='>') { | 338 | while (h.length()>0 && h[h.length()-1]=='>') { |
339 | h.remove(h.length()-1,1); | 339 | h.remove(h.length()-1,1); |
340 | } | 340 | } |
341 | if (h.isEmpty()) continue; | 341 | if (h.isEmpty()) continue; |
342 | nsize = strlen(h.latin1()); | 342 | nsize = strlen(h.latin1()); |
343 | /* yes! must be malloc! */ | 343 | /* yes! must be malloc! */ |
344 | c_reply = (char*)malloc( (nsize+1)*sizeof(char)); | 344 | c_reply = (char*)malloc( (nsize+1)*sizeof(char)); |
345 | memset(c_reply,0,nsize+1); | 345 | memset(c_reply,0,nsize+1); |
346 | memcpy(c_reply,h.latin1(),nsize); | 346 | memcpy(c_reply,h.latin1(),nsize); |
347 | clist_append(in_reply_to,c_reply); | 347 | clist_append(in_reply_to,c_reply); |
348 | qDebug("In reply to: %s",c_reply); | 348 | odebug << "In reply to: " << c_reply << "" << oendl; |
349 | } | 349 | } |
350 | } | 350 | } |
351 | 351 | ||
352 | if (res) { | 352 | if (res) { |
353 | fields = mailimf_fields_new_with_data( from, sender, reply, to, cc, bcc, | 353 | fields = mailimf_fields_new_with_data( from, sender, reply, to, cc, bcc, |
354 | in_reply_to, NULL, subject ); | 354 | in_reply_to, NULL, subject ); |
355 | if ( fields == NULL ) { | 355 | if ( fields == NULL ) { |
356 | qDebug("Error creating mailimf fields"); | 356 | odebug << "Error creating mailimf fields" << oendl; |
357 | res = 0; | 357 | res = 0; |
358 | } | 358 | } |
359 | } | 359 | } |
360 | if (res) xmailer = mailimf_field_new_custom( strdup( "User-Agent" ), | 360 | if (res) xmailer = mailimf_field_new_custom( strdup( "User-Agent" ), |
361 | strdup( USER_AGENT ) ); | 361 | strdup( USER_AGENT ) ); |
362 | if ( xmailer == NULL ) { | 362 | if ( xmailer == NULL ) { |
363 | res = 0; | 363 | res = 0; |
364 | } else { | 364 | } else { |
365 | err = mailimf_fields_add( fields, xmailer ); | 365 | err = mailimf_fields_add( fields, xmailer ); |
366 | if ( err != MAILIMF_NO_ERROR ) { | 366 | if ( err != MAILIMF_NO_ERROR ) { |
367 | res = 0; | 367 | res = 0; |
368 | } | 368 | } |
@@ -426,25 +426,25 @@ mailmime *Generatemail::createMimeMail(const Opie::Core::OSmartPointer<Mail> &ma | |||
426 | 426 | ||
427 | addFileParts( message, mail->getAttachments() ); | 427 | addFileParts( message, mail->getAttachments() ); |
428 | 428 | ||
429 | return message; // Success :) | 429 | return message; // Success :) |
430 | 430 | ||
431 | err_free_txtPart: | 431 | err_free_txtPart: |
432 | mailmime_free( txtPart ); | 432 | mailmime_free( txtPart ); |
433 | err_free_message: | 433 | err_free_message: |
434 | mailmime_free( message ); | 434 | mailmime_free( message ); |
435 | err_free_fields: | 435 | err_free_fields: |
436 | mailimf_fields_free( fields ); | 436 | mailimf_fields_free( fields ); |
437 | err_free: | 437 | err_free: |
438 | qDebug( "createMimeMail: error" ); | 438 | odebug << "createMimeMail: error" << oendl; |
439 | 439 | ||
440 | return NULL; // Error :( | 440 | return NULL; // Error :( |
441 | } | 441 | } |
442 | 442 | ||
443 | clist *Generatemail::createRcptList( mailimf_fields *fields ) { | 443 | clist *Generatemail::createRcptList( mailimf_fields *fields ) { |
444 | clist *rcptList; | 444 | clist *rcptList; |
445 | mailimf_field *field; | 445 | mailimf_field *field; |
446 | 446 | ||
447 | rcptList = esmtp_address_list_new(); | 447 | rcptList = esmtp_address_list_new(); |
448 | 448 | ||
449 | field = getField( fields, MAILIMF_FIELD_TO ); | 449 | field = getField( fields, MAILIMF_FIELD_TO ); |
450 | if ( field && (field->fld_type == MAILIMF_FIELD_TO) | 450 | if ( field && (field->fld_type == MAILIMF_FIELD_TO) |
diff --git a/noncore/net/mail/libmailwrapper/genericwrapper.cpp b/noncore/net/mail/libmailwrapper/genericwrapper.cpp index 0c68280..fae4c99 100644 --- a/noncore/net/mail/libmailwrapper/genericwrapper.cpp +++ b/noncore/net/mail/libmailwrapper/genericwrapper.cpp | |||
@@ -126,25 +126,25 @@ QString Genericwrapper::getencoding(mailmime_mechanism*aEnc) | |||
126 | default: | 126 | default: |
127 | if (aEnc->enc_token) { | 127 | if (aEnc->enc_token) { |
128 | enc = QString(aEnc->enc_token); | 128 | enc = QString(aEnc->enc_token); |
129 | } | 129 | } |
130 | break; | 130 | break; |
131 | } | 131 | } |
132 | return enc; | 132 | return enc; |
133 | } | 133 | } |
134 | 134 | ||
135 | void Genericwrapper::traverseBody(RecBodyP&target,mailmessage*message,mailmime*mime,QValueList<int>recList,unsigned int current_rec,int current_count) | 135 | void Genericwrapper::traverseBody(RecBodyP&target,mailmessage*message,mailmime*mime,QValueList<int>recList,unsigned int current_rec,int current_count) |
136 | { | 136 | { |
137 | if (current_rec >= 10) { | 137 | if (current_rec >= 10) { |
138 | qDebug("too deep recursion!"); | 138 | odebug << "too deep recursion!" << oendl; |
139 | } | 139 | } |
140 | if (!message || !mime) { | 140 | if (!message || !mime) { |
141 | return; | 141 | return; |
142 | } | 142 | } |
143 | int r; | 143 | int r; |
144 | char*data = 0; | 144 | char*data = 0; |
145 | size_t len; | 145 | size_t len; |
146 | clistiter * cur = 0; | 146 | clistiter * cur = 0; |
147 | QString b; | 147 | QString b; |
148 | RecPartP part = new RecPart(); | 148 | RecPartP part = new RecPart(); |
149 | 149 | ||
150 | switch (mime->mm_type) { | 150 | switch (mime->mm_type) { |
@@ -263,25 +263,25 @@ QString Genericwrapper::parseAddressList( mailimf_address_list *list ) | |||
263 | } else { | 263 | } else { |
264 | first = false; | 264 | first = false; |
265 | } | 265 | } |
266 | 266 | ||
267 | switch ( addr->ad_type ) { | 267 | switch ( addr->ad_type ) { |
268 | case MAILIMF_ADDRESS_MAILBOX: | 268 | case MAILIMF_ADDRESS_MAILBOX: |
269 | result.append( parseMailbox( addr->ad_data.ad_mailbox ) ); | 269 | result.append( parseMailbox( addr->ad_data.ad_mailbox ) ); |
270 | break; | 270 | break; |
271 | case MAILIMF_ADDRESS_GROUP: | 271 | case MAILIMF_ADDRESS_GROUP: |
272 | result.append( parseGroup( addr->ad_data.ad_group ) ); | 272 | result.append( parseGroup( addr->ad_data.ad_group ) ); |
273 | break; | 273 | break; |
274 | default: | 274 | default: |
275 | qDebug( "Generic: unkown mailimf address type" ); | 275 | odebug << "Generic: unkown mailimf address type" << oendl; |
276 | break; | 276 | break; |
277 | } | 277 | } |
278 | } | 278 | } |
279 | 279 | ||
280 | return result; | 280 | return result; |
281 | } | 281 | } |
282 | 282 | ||
283 | QString Genericwrapper::parseGroup( mailimf_group *group ) | 283 | QString Genericwrapper::parseGroup( mailimf_group *group ) |
284 | { | 284 | { |
285 | QString result( "" ); | 285 | QString result( "" ); |
286 | 286 | ||
287 | result.append( group->grp_display_name ); | 287 | result.append( group->grp_display_name ); |
@@ -356,25 +356,25 @@ QString Genericwrapper::fetchTextPart(const RecMailP&mail,const RecPartP&part) | |||
356 | return text; | 356 | return text; |
357 | } | 357 | } |
358 | 358 | ||
359 | void Genericwrapper::cleanMimeCache() | 359 | void Genericwrapper::cleanMimeCache() |
360 | { | 360 | { |
361 | QMap<QString,encodedString*>::Iterator it = bodyCache.begin(); | 361 | QMap<QString,encodedString*>::Iterator it = bodyCache.begin(); |
362 | for (;it!=bodyCache.end();++it) { | 362 | for (;it!=bodyCache.end();++it) { |
363 | encodedString*t = it.data(); | 363 | encodedString*t = it.data(); |
364 | //it.setValue(0); | 364 | //it.setValue(0); |
365 | if (t) delete t; | 365 | if (t) delete t; |
366 | } | 366 | } |
367 | bodyCache.clear(); | 367 | bodyCache.clear(); |
368 | qDebug("Genericwrapper: cache cleaned"); | 368 | odebug << "Genericwrapper: cache cleaned" << oendl; |
369 | } | 369 | } |
370 | 370 | ||
371 | QStringList Genericwrapper::parseInreplies(mailimf_in_reply_to * in_replies) | 371 | QStringList Genericwrapper::parseInreplies(mailimf_in_reply_to * in_replies) |
372 | { | 372 | { |
373 | QStringList res; | 373 | QStringList res; |
374 | if (!in_replies || !in_replies->mid_list) return res; | 374 | if (!in_replies || !in_replies->mid_list) return res; |
375 | clistiter * current = 0; | 375 | clistiter * current = 0; |
376 | for ( current = clist_begin( in_replies->mid_list ); current != NULL; current = current->next ) { | 376 | for ( current = clist_begin( in_replies->mid_list ); current != NULL; current = current->next ) { |
377 | QString h((char*)current->data); | 377 | QString h((char*)current->data); |
378 | while (h.length()>0 && h[0]=='<') { | 378 | while (h.length()>0 && h[0]=='<') { |
379 | h.remove(0,1); | 379 | h.remove(0,1); |
380 | } | 380 | } |
@@ -385,44 +385,44 @@ QStringList Genericwrapper::parseInreplies(mailimf_in_reply_to * in_replies) | |||
385 | res.append(h); | 385 | res.append(h); |
386 | } | 386 | } |
387 | } | 387 | } |
388 | return res; | 388 | return res; |
389 | } | 389 | } |
390 | 390 | ||
391 | void Genericwrapper::parseList(QValueList<Opie::Core::OSmartPointer<RecMail> > &target,mailsession*session,const QString&mailbox,bool mbox_as_to) | 391 | void Genericwrapper::parseList(QValueList<Opie::Core::OSmartPointer<RecMail> > &target,mailsession*session,const QString&mailbox,bool mbox_as_to) |
392 | { | 392 | { |
393 | int r; | 393 | int r; |
394 | mailmessage_list * env_list = 0; | 394 | mailmessage_list * env_list = 0; |
395 | r = mailsession_get_messages_list(session,&env_list); | 395 | r = mailsession_get_messages_list(session,&env_list); |
396 | if (r != MAIL_NO_ERROR) { | 396 | if (r != MAIL_NO_ERROR) { |
397 | qDebug("Error message list"); | 397 | odebug << "Error message list" << oendl; |
398 | return; | 398 | return; |
399 | } | 399 | } |
400 | r = mailsession_get_envelopes_list(session, env_list); | 400 | r = mailsession_get_envelopes_list(session, env_list); |
401 | if (r != MAIL_NO_ERROR) { | 401 | if (r != MAIL_NO_ERROR) { |
402 | qDebug("Error filling message list"); | 402 | odebug << "Error filling message list" << oendl; |
403 | if (env_list) { | 403 | if (env_list) { |
404 | mailmessage_list_free(env_list); | 404 | mailmessage_list_free(env_list); |
405 | } | 405 | } |
406 | return; | 406 | return; |
407 | } | 407 | } |
408 | mailimf_references * refs = 0; | 408 | mailimf_references * refs = 0; |
409 | mailimf_in_reply_to * in_replies = 0; | 409 | mailimf_in_reply_to * in_replies = 0; |
410 | uint32_t i = 0; | 410 | uint32_t i = 0; |
411 | for(; i < carray_count(env_list->msg_tab) ; ++i) { | 411 | for(; i < carray_count(env_list->msg_tab) ; ++i) { |
412 | mailmessage * msg; | 412 | mailmessage * msg; |
413 | QBitArray mFlags(7); | 413 | QBitArray mFlags(7); |
414 | msg = (mailmessage*)carray_get(env_list->msg_tab, i); | 414 | msg = (mailmessage*)carray_get(env_list->msg_tab, i); |
415 | if (msg->msg_fields == NULL) { | 415 | if (msg->msg_fields == NULL) { |
416 | //qDebug("could not fetch envelope of message %i", i); | 416 | //odebug << "could not fetch envelope of message " << i << "" << oendl; |
417 | continue; | 417 | continue; |
418 | } | 418 | } |
419 | RecMailP mail = new RecMail(); | 419 | RecMailP mail = new RecMail(); |
420 | mail->setWrapper(this); | 420 | mail->setWrapper(this); |
421 | mail_flags * flag_result = 0; | 421 | mail_flags * flag_result = 0; |
422 | r = mailmessage_get_flags(msg,&flag_result); | 422 | r = mailmessage_get_flags(msg,&flag_result); |
423 | if (r == MAIL_ERROR_NOT_IMPLEMENTED) { | 423 | if (r == MAIL_ERROR_NOT_IMPLEMENTED) { |
424 | mFlags.setBit(FLAG_SEEN); | 424 | mFlags.setBit(FLAG_SEEN); |
425 | } | 425 | } |
426 | mailimf_single_fields single_fields; | 426 | mailimf_single_fields single_fields; |
427 | mailimf_single_fields_init(&single_fields, msg->msg_fields); | 427 | mailimf_single_fields_init(&single_fields, msg->msg_fields); |
428 | mail->setMsgsize(msg->msg_size); | 428 | mail->setMsgsize(msg->msg_size); |
@@ -439,25 +439,25 @@ void Genericwrapper::parseList(QValueList<Opie::Core::OSmartPointer<RecMail> > & | |||
439 | } else { | 439 | } else { |
440 | mail->setTo(mailbox); | 440 | mail->setTo(mailbox); |
441 | } | 441 | } |
442 | if (single_fields.fld_cc) | 442 | if (single_fields.fld_cc) |
443 | mail->setCC( parseAddressList( single_fields.fld_cc->cc_addr_list ) ); | 443 | mail->setCC( parseAddressList( single_fields.fld_cc->cc_addr_list ) ); |
444 | if (single_fields.fld_bcc) | 444 | if (single_fields.fld_bcc) |
445 | mail->setBcc( parseAddressList( single_fields.fld_bcc->bcc_addr_list ) ); | 445 | mail->setBcc( parseAddressList( single_fields.fld_bcc->bcc_addr_list ) ); |
446 | if (single_fields.fld_orig_date) | 446 | if (single_fields.fld_orig_date) |
447 | mail->setDate( parseDateTime( single_fields.fld_orig_date->dt_date_time ) ); | 447 | mail->setDate( parseDateTime( single_fields.fld_orig_date->dt_date_time ) ); |
448 | // crashes when accessing pop3 account? | 448 | // crashes when accessing pop3 account? |
449 | if (single_fields.fld_message_id->mid_value) { | 449 | if (single_fields.fld_message_id->mid_value) { |
450 | mail->setMsgid(QString(single_fields.fld_message_id->mid_value)); | 450 | mail->setMsgid(QString(single_fields.fld_message_id->mid_value)); |
451 | qDebug("Msgid == %s",mail->Msgid().latin1()); | 451 | odebug << "Msgid == " << mail->Msgid().latin1() << "" << oendl; |
452 | } | 452 | } |
453 | 453 | ||
454 | if (single_fields.fld_reply_to) { | 454 | if (single_fields.fld_reply_to) { |
455 | QStringList t = parseAddressList(single_fields.fld_reply_to->rt_addr_list); | 455 | QStringList t = parseAddressList(single_fields.fld_reply_to->rt_addr_list); |
456 | if (t.count()>0) { | 456 | if (t.count()>0) { |
457 | mail->setReplyto(t[0]); | 457 | mail->setReplyto(t[0]); |
458 | } | 458 | } |
459 | } | 459 | } |
460 | #if 0 | 460 | #if 0 |
461 | refs = single_fields.fld_references; | 461 | refs = single_fields.fld_references; |
462 | if (refs && refs->mid_list && clist_count(refs->mid_list)) { | 462 | if (refs && refs->mid_list && clist_count(refs->mid_list)) { |
463 | char * text = (char*)refs->mid_list->first->data; | 463 | char * text = (char*)refs->mid_list->first->data; |
diff --git a/noncore/net/mail/libmailwrapper/imapwrapper.cpp b/noncore/net/mail/libmailwrapper/imapwrapper.cpp index 657c2ba..35468fe 100644 --- a/noncore/net/mail/libmailwrapper/imapwrapper.cpp +++ b/noncore/net/mail/libmailwrapper/imapwrapper.cpp | |||
@@ -21,69 +21,69 @@ IMAPwrapper::~IMAPwrapper() | |||
21 | logout(); | 21 | logout(); |
22 | } | 22 | } |
23 | 23 | ||
24 | /* to avoid to often select statements in loops etc. | 24 | /* to avoid to often select statements in loops etc. |
25 | we trust that we are logged in and connection is established!*/ | 25 | we trust that we are logged in and connection is established!*/ |
26 | int IMAPwrapper::selectMbox(const QString&mbox) | 26 | int IMAPwrapper::selectMbox(const QString&mbox) |
27 | { | 27 | { |
28 | if (mbox == m_Lastmbox) { | 28 | if (mbox == m_Lastmbox) { |
29 | return MAILIMAP_NO_ERROR; | 29 | return MAILIMAP_NO_ERROR; |
30 | } | 30 | } |
31 | int err = mailimap_select( m_imap, (char*)mbox.latin1()); | 31 | int err = mailimap_select( m_imap, (char*)mbox.latin1()); |
32 | if ( err != MAILIMAP_NO_ERROR ) { | 32 | if ( err != MAILIMAP_NO_ERROR ) { |
33 | qDebug("error selecting mailbox: %s",m_imap->imap_response); | 33 | odebug << "error selecting mailbox: " << m_imap->imap_response << "" << oendl; |
34 | m_Lastmbox = ""; | 34 | m_Lastmbox = ""; |
35 | return err; | 35 | return err; |
36 | } | 36 | } |
37 | m_Lastmbox = mbox; | 37 | m_Lastmbox = mbox; |
38 | return err; | 38 | return err; |
39 | } | 39 | } |
40 | 40 | ||
41 | void IMAPwrapper::imap_progress( size_t current, size_t maximum ) | 41 | void IMAPwrapper::imap_progress( size_t current, size_t maximum ) |
42 | { | 42 | { |
43 | qApp->processEvents(); | 43 | qApp->processEvents(); |
44 | qDebug( "IMAP: %i of %i", current, maximum ); | 44 | odebug << "IMAP: " << current << " of " << maximum << "" << oendl; |
45 | } | 45 | } |
46 | 46 | ||
47 | bool IMAPwrapper::start_tls(bool force_tls) | 47 | bool IMAPwrapper::start_tls(bool force_tls) |
48 | { | 48 | { |
49 | int err; | 49 | int err; |
50 | bool try_tls; | 50 | bool try_tls; |
51 | mailimap_capability_data * cap_data = 0; | 51 | mailimap_capability_data * cap_data = 0; |
52 | 52 | ||
53 | err = mailimap_capability(m_imap,&cap_data); | 53 | err = mailimap_capability(m_imap,&cap_data); |
54 | if (err != MAILIMAP_NO_ERROR) { | 54 | if (err != MAILIMAP_NO_ERROR) { |
55 | Global::statusMessage("error getting capabilities!"); | 55 | Global::statusMessage("error getting capabilities!"); |
56 | qDebug("error getting capabilities!"); | 56 | odebug << "error getting capabilities!" << oendl; |
57 | return false; | 57 | return false; |
58 | } | 58 | } |
59 | clistiter * cur; | 59 | clistiter * cur; |
60 | for(cur = clist_begin(cap_data->cap_list) ; cur != NULL;cur = clist_next(cur)) { | 60 | for(cur = clist_begin(cap_data->cap_list) ; cur != NULL;cur = clist_next(cur)) { |
61 | struct mailimap_capability * cap; | 61 | struct mailimap_capability * cap; |
62 | cap = (struct mailimap_capability *)clist_content(cur); | 62 | cap = (struct mailimap_capability *)clist_content(cur); |
63 | if (cap->cap_type == MAILIMAP_CAPABILITY_NAME) { | 63 | if (cap->cap_type == MAILIMAP_CAPABILITY_NAME) { |
64 | if (strcasecmp(cap->cap_data.cap_name, "STARTTLS") == 0) { | 64 | if (strcasecmp(cap->cap_data.cap_name, "STARTTLS") == 0) { |
65 | try_tls = true; | 65 | try_tls = true; |
66 | break; | 66 | break; |
67 | } | 67 | } |
68 | } | 68 | } |
69 | } | 69 | } |
70 | if (cap_data) { | 70 | if (cap_data) { |
71 | mailimap_capability_data_free(cap_data); | 71 | mailimap_capability_data_free(cap_data); |
72 | } | 72 | } |
73 | if (try_tls) { | 73 | if (try_tls) { |
74 | err = mailimap_starttls(m_imap); | 74 | err = mailimap_starttls(m_imap); |
75 | if (err != MAILIMAP_NO_ERROR && force_tls) { | 75 | if (err != MAILIMAP_NO_ERROR && force_tls) { |
76 | Global::statusMessage(tr("Server has no TLS support!")); | 76 | Global::statusMessage(tr("Server has no TLS support!")); |
77 | qDebug("Server has no TLS support!"); | 77 | odebug << "Server has no TLS support!" << oendl; |
78 | try_tls = false; | 78 | try_tls = false; |
79 | } else { | 79 | } else { |
80 | mailstream_low * low; | 80 | mailstream_low * low; |
81 | mailstream_low * new_low; | 81 | mailstream_low * new_low; |
82 | low = mailstream_get_low(m_imap->imap_stream); | 82 | low = mailstream_get_low(m_imap->imap_stream); |
83 | if (!low) { | 83 | if (!low) { |
84 | try_tls = false; | 84 | try_tls = false; |
85 | } else { | 85 | } else { |
86 | int fd = mailstream_low_get_fd(low); | 86 | int fd = mailstream_low_get_fd(low); |
87 | if (fd > -1 && (new_low = mailstream_low_ssl_open(fd))!=0) { | 87 | if (fd > -1 && (new_low = mailstream_low_ssl_open(fd))!=0) { |
88 | mailstream_low_free(low); | 88 | mailstream_low_free(low); |
89 | mailstream_set_low(m_imap->imap_stream, new_low); | 89 | mailstream_set_low(m_imap->imap_stream, new_low); |
@@ -116,48 +116,48 @@ void IMAPwrapper::login() | |||
116 | } | 116 | } |
117 | server = account->getServer().latin1(); | 117 | server = account->getServer().latin1(); |
118 | port = account->getPort().toUInt(); | 118 | port = account->getPort().toUInt(); |
119 | if ( account->getUser().isEmpty() || account->getPassword().isEmpty() ) { | 119 | if ( account->getUser().isEmpty() || account->getPassword().isEmpty() ) { |
120 | LoginDialog login( account->getUser(), account->getPassword(), NULL, 0, true ); | 120 | LoginDialog login( account->getUser(), account->getPassword(), NULL, 0, true ); |
121 | login.show(); | 121 | login.show(); |
122 | if ( QDialog::Accepted == login.exec() ) { | 122 | if ( QDialog::Accepted == login.exec() ) { |
123 | // ok | 123 | // ok |
124 | user = login.getUser().latin1(); | 124 | user = login.getUser().latin1(); |
125 | pass = login.getPassword().latin1(); | 125 | pass = login.getPassword().latin1(); |
126 | } else { | 126 | } else { |
127 | // cancel | 127 | // cancel |
128 | qDebug( "IMAP: Login canceled" ); | 128 | odebug << "IMAP: Login canceled" << oendl; |
129 | return; | 129 | return; |
130 | } | 130 | } |
131 | } else { | 131 | } else { |
132 | user = account->getUser().latin1(); | 132 | user = account->getUser().latin1(); |
133 | pass = account->getPassword().latin1(); | 133 | pass = account->getPassword().latin1(); |
134 | } | 134 | } |
135 | 135 | ||
136 | m_imap = mailimap_new( 20, &imap_progress ); | 136 | m_imap = mailimap_new( 20, &imap_progress ); |
137 | 137 | ||
138 | /* connect */ | 138 | /* connect */ |
139 | bool ssl = false; | 139 | bool ssl = false; |
140 | bool try_tls = false; | 140 | bool try_tls = false; |
141 | bool force_tls = false; | 141 | bool force_tls = false; |
142 | 142 | ||
143 | if ( account->ConnectionType() == 2 ) { | 143 | if ( account->ConnectionType() == 2 ) { |
144 | ssl = true; | 144 | ssl = true; |
145 | } | 145 | } |
146 | if (account->ConnectionType()==1) { | 146 | if (account->ConnectionType()==1) { |
147 | force_tls = true; | 147 | force_tls = true; |
148 | } | 148 | } |
149 | 149 | ||
150 | if ( ssl ) { | 150 | if ( ssl ) { |
151 | qDebug( "using ssl" ); | 151 | odebug << "using ssl" << oendl; |
152 | err = mailimap_ssl_connect( m_imap, (char*)server, port ); | 152 | err = mailimap_ssl_connect( m_imap, (char*)server, port ); |
153 | } else { | 153 | } else { |
154 | err = mailimap_socket_connect( m_imap, (char*)server, port ); | 154 | err = mailimap_socket_connect( m_imap, (char*)server, port ); |
155 | } | 155 | } |
156 | 156 | ||
157 | if ( err != MAILIMAP_NO_ERROR && | 157 | if ( err != MAILIMAP_NO_ERROR && |
158 | err != MAILIMAP_NO_ERROR_AUTHENTICATED && | 158 | err != MAILIMAP_NO_ERROR_AUTHENTICATED && |
159 | err != MAILIMAP_NO_ERROR_NON_AUTHENTICATED ) { | 159 | err != MAILIMAP_NO_ERROR_NON_AUTHENTICATED ) { |
160 | QString failure = ""; | 160 | QString failure = ""; |
161 | if (err == MAILIMAP_ERROR_CONNECTION_REFUSED) { | 161 | if (err == MAILIMAP_ERROR_CONNECTION_REFUSED) { |
162 | failure="Connection refused"; | 162 | failure="Connection refused"; |
163 | } else { | 163 | } else { |
@@ -167,25 +167,25 @@ void IMAPwrapper::login() | |||
167 | mailimap_free( m_imap ); | 167 | mailimap_free( m_imap ); |
168 | m_imap = 0; | 168 | m_imap = 0; |
169 | return; | 169 | return; |
170 | } | 170 | } |
171 | 171 | ||
172 | if (!ssl) { | 172 | if (!ssl) { |
173 | try_tls = start_tls(force_tls); | 173 | try_tls = start_tls(force_tls); |
174 | } | 174 | } |
175 | 175 | ||
176 | bool ok = true; | 176 | bool ok = true; |
177 | if (force_tls && !try_tls) { | 177 | if (force_tls && !try_tls) { |
178 | Global::statusMessage(tr("Server has no TLS support!")); | 178 | Global::statusMessage(tr("Server has no TLS support!")); |
179 | qDebug("Server has no TLS support!"); | 179 | odebug << "Server has no TLS support!" << oendl; |
180 | ok = false; | 180 | ok = false; |
181 | } | 181 | } |
182 | 182 | ||
183 | 183 | ||
184 | /* login */ | 184 | /* login */ |
185 | 185 | ||
186 | if (ok) { | 186 | if (ok) { |
187 | err = mailimap_login_simple( m_imap, (char*)user, (char*)pass ); | 187 | err = mailimap_login_simple( m_imap, (char*)user, (char*)pass ); |
188 | if ( err != MAILIMAP_NO_ERROR ) { | 188 | if ( err != MAILIMAP_NO_ERROR ) { |
189 | Global::statusMessage(tr("error logging in imap server: %1").arg(m_imap->imap_response)); | 189 | Global::statusMessage(tr("error logging in imap server: %1").arg(m_imap->imap_response)); |
190 | ok = false; | 190 | ok = false; |
191 | } | 191 | } |
@@ -308,35 +308,35 @@ QValueList<Opie::Core::OSmartPointer<Folder> >* IMAPwrapper::listFolders() | |||
308 | if ( (bflags = list->mb_flag) ) { | 308 | if ( (bflags = list->mb_flag) ) { |
309 | selectable = !(bflags->mbf_type==MAILIMAP_MBX_LIST_FLAGS_SFLAG&& | 309 | selectable = !(bflags->mbf_type==MAILIMAP_MBX_LIST_FLAGS_SFLAG&& |
310 | bflags->mbf_sflag==MAILIMAP_MBX_LIST_SFLAG_NOSELECT); | 310 | bflags->mbf_sflag==MAILIMAP_MBX_LIST_SFLAG_NOSELECT); |
311 | for(cur_flag=clist_begin(bflags->mbf_oflags);cur_flag;cur_flag=clist_next(cur_flag)) { | 311 | for(cur_flag=clist_begin(bflags->mbf_oflags);cur_flag;cur_flag=clist_next(cur_flag)) { |
312 | if ( ((mailimap_mbx_list_oflag*)cur_flag->data)->of_type==MAILIMAP_MBX_LIST_OFLAG_NOINFERIORS) { | 312 | if ( ((mailimap_mbx_list_oflag*)cur_flag->data)->of_type==MAILIMAP_MBX_LIST_OFLAG_NOINFERIORS) { |
313 | no_inferiors = true; | 313 | no_inferiors = true; |
314 | } | 314 | } |
315 | } | 315 | } |
316 | } | 316 | } |
317 | folders->append( new IMAPFolder(temp,del,selectable,no_inferiors,account->getPrefix())); | 317 | folders->append( new IMAPFolder(temp,del,selectable,no_inferiors,account->getPrefix())); |
318 | } | 318 | } |
319 | } else { | 319 | } else { |
320 | qDebug("error fetching folders: %s",m_imap->imap_response); | 320 | odebug << "error fetching folders: " << m_imap->imap_response << "" << oendl; |
321 | } | 321 | } |
322 | mailimap_list_result_free( result ); | 322 | mailimap_list_result_free( result ); |
323 | 323 | ||
324 | /* | 324 | /* |
325 | * second stage - get the other then inbox folders | 325 | * second stage - get the other then inbox folders |
326 | */ | 326 | */ |
327 | mask = "*" ; | 327 | mask = "*" ; |
328 | path = account->getPrefix().latin1(); | 328 | path = account->getPrefix().latin1(); |
329 | if (!path) path = ""; | 329 | if (!path) path = ""; |
330 | qDebug(path); | 330 | odebug << path << oendl; |
331 | err = mailimap_list( m_imap, (char*)path, (char*)mask, &result ); | 331 | err = mailimap_list( m_imap, (char*)path, (char*)mask, &result ); |
332 | if ( err == MAILIMAP_NO_ERROR ) { | 332 | if ( err == MAILIMAP_NO_ERROR ) { |
333 | current = result->first; | 333 | current = result->first; |
334 | for ( current=clist_begin(result);current!=NULL;current=clist_next(current)) { | 334 | for ( current=clist_begin(result);current!=NULL;current=clist_next(current)) { |
335 | no_inferiors = false; | 335 | no_inferiors = false; |
336 | list = (mailimap_mailbox_list *) current->data; | 336 | list = (mailimap_mailbox_list *) current->data; |
337 | // it is better use the deep copy mechanism of qt itself | 337 | // it is better use the deep copy mechanism of qt itself |
338 | // instead of using strdup! | 338 | // instead of using strdup! |
339 | temp = list->mb_name; | 339 | temp = list->mb_name; |
340 | if (temp.lower()=="inbox") | 340 | if (temp.lower()=="inbox") |
341 | continue; | 341 | continue; |
342 | if (temp.lower()==account->getPrefix().lower()) | 342 | if (temp.lower()==account->getPrefix().lower()) |
@@ -345,25 +345,25 @@ QValueList<Opie::Core::OSmartPointer<Folder> >* IMAPwrapper::listFolders() | |||
345 | selectable = !(bflags->mbf_type==MAILIMAP_MBX_LIST_FLAGS_SFLAG&& | 345 | selectable = !(bflags->mbf_type==MAILIMAP_MBX_LIST_FLAGS_SFLAG&& |
346 | bflags->mbf_sflag==MAILIMAP_MBX_LIST_SFLAG_NOSELECT); | 346 | bflags->mbf_sflag==MAILIMAP_MBX_LIST_SFLAG_NOSELECT); |
347 | for(cur_flag=clist_begin(bflags->mbf_oflags);cur_flag;cur_flag=clist_next(cur_flag)) { | 347 | for(cur_flag=clist_begin(bflags->mbf_oflags);cur_flag;cur_flag=clist_next(cur_flag)) { |
348 | if ( ((mailimap_mbx_list_oflag*)cur_flag->data)->of_type==MAILIMAP_MBX_LIST_OFLAG_NOINFERIORS) { | 348 | if ( ((mailimap_mbx_list_oflag*)cur_flag->data)->of_type==MAILIMAP_MBX_LIST_OFLAG_NOINFERIORS) { |
349 | no_inferiors = true; | 349 | no_inferiors = true; |
350 | } | 350 | } |
351 | } | 351 | } |
352 | } | 352 | } |
353 | del = list->mb_delimiter; | 353 | del = list->mb_delimiter; |
354 | folders->append(new IMAPFolder(temp,del,selectable,no_inferiors,account->getPrefix())); | 354 | folders->append(new IMAPFolder(temp,del,selectable,no_inferiors,account->getPrefix())); |
355 | } | 355 | } |
356 | } else { | 356 | } else { |
357 | qDebug("error fetching folders %s",m_imap->imap_response); | 357 | odebug << "error fetching folders " << m_imap->imap_response << "" << oendl; |
358 | } | 358 | } |
359 | if (result) mailimap_list_result_free( result ); | 359 | if (result) mailimap_list_result_free( result ); |
360 | return folders; | 360 | return folders; |
361 | } | 361 | } |
362 | 362 | ||
363 | RecMail*IMAPwrapper::parse_list_result(mailimap_msg_att* m_att) | 363 | RecMail*IMAPwrapper::parse_list_result(mailimap_msg_att* m_att) |
364 | { | 364 | { |
365 | RecMail * m = 0; | 365 | RecMail * m = 0; |
366 | mailimap_msg_att_item *item=0; | 366 | mailimap_msg_att_item *item=0; |
367 | clistcell *current,*c,*cf; | 367 | clistcell *current,*c,*cf; |
368 | mailimap_msg_att_dynamic*flist; | 368 | mailimap_msg_att_dynamic*flist; |
369 | mailimap_flag_fetch*cflag; | 369 | mailimap_flag_fetch*cflag; |
@@ -457,26 +457,26 @@ RecMail*IMAPwrapper::parse_list_result(mailimap_msg_att* m_att) | |||
457 | } | 457 | } |
458 | if (h.length()>0) { | 458 | if (h.length()>0) { |
459 | m->setInreply(QStringList(h)); | 459 | m->setInreply(QStringList(h)); |
460 | } | 460 | } |
461 | } | 461 | } |
462 | if (head->env_message_id) { | 462 | if (head->env_message_id) { |
463 | m->setMsgid(QString(head->env_message_id)); | 463 | m->setMsgid(QString(head->env_message_id)); |
464 | } | 464 | } |
465 | } else if (item->att_data.att_static->att_type==MAILIMAP_MSG_ATT_INTERNALDATE) { | 465 | } else if (item->att_data.att_static->att_type==MAILIMAP_MSG_ATT_INTERNALDATE) { |
466 | #if 0 | 466 | #if 0 |
467 | mailimap_date_time*d = item->att_data.att_static->att_data.att_internal_date; | 467 | mailimap_date_time*d = item->att_data.att_static->att_data.att_internal_date; |
468 | QDateTime da(QDate(d->dt_year,d->dt_month,d->dt_day),QTime(d->dt_hour,d->dt_min,d->dt_sec)); | 468 | QDateTime da(QDate(d->dt_year,d->dt_month,d->dt_day),QTime(d->dt_hour,d->dt_min,d->dt_sec)); |
469 | qDebug("%i %i %i - %i %i %i",d->dt_year,d->dt_month,d->dt_day,d->dt_hour,d->dt_min,d->dt_sec); | 469 | odebug << "" << d->dt_year << " " << d->dt_month << " " << d->dt_day << " - " << d->dt_hour << " " << d->dt_min << " " << d->dt_sec << "" << oendl; |
470 | qDebug(da.toString()); | 470 | odebug << da.toString() << oendl; |
471 | #endif | 471 | #endif |
472 | } else if (item->att_data.att_static->att_type==MAILIMAP_MSG_ATT_RFC822_SIZE) { | 472 | } else if (item->att_data.att_static->att_type==MAILIMAP_MSG_ATT_RFC822_SIZE) { |
473 | size = item->att_data.att_static->att_data.att_rfc822_size; | 473 | size = item->att_data.att_static->att_data.att_rfc822_size; |
474 | } | 474 | } |
475 | } | 475 | } |
476 | /* msg is already deleted */ | 476 | /* msg is already deleted */ |
477 | if (mFlags.testBit(FLAG_DELETED) && m) { | 477 | if (mFlags.testBit(FLAG_DELETED) && m) { |
478 | delete m; | 478 | delete m; |
479 | m = 0; | 479 | m = 0; |
480 | } | 480 | } |
481 | if (m) { | 481 | if (m) { |
482 | m->setFlags(mFlags); | 482 | m->setFlags(mFlags); |
@@ -515,25 +515,25 @@ RecBodyP IMAPwrapper::fetchBody(const RecMailP&mail) | |||
515 | err = mailimap_fetch( m_imap, set, fetchType, &result ); | 515 | err = mailimap_fetch( m_imap, set, fetchType, &result ); |
516 | mailimap_set_free( set ); | 516 | mailimap_set_free( set ); |
517 | mailimap_fetch_type_free( fetchType ); | 517 | mailimap_fetch_type_free( fetchType ); |
518 | 518 | ||
519 | if (err == MAILIMAP_NO_ERROR && (current=clist_begin(result)) ) { | 519 | if (err == MAILIMAP_NO_ERROR && (current=clist_begin(result)) ) { |
520 | mailimap_msg_att * msg_att; | 520 | mailimap_msg_att * msg_att; |
521 | msg_att = (mailimap_msg_att*)current->data; | 521 | msg_att = (mailimap_msg_att*)current->data; |
522 | mailimap_msg_att_item*item = (mailimap_msg_att_item*)msg_att->att_list->first->data; | 522 | mailimap_msg_att_item*item = (mailimap_msg_att_item*)msg_att->att_list->first->data; |
523 | QValueList<int> path; | 523 | QValueList<int> path; |
524 | body_desc = item->att_data.att_static->att_data.att_body; | 524 | body_desc = item->att_data.att_static->att_data.att_body; |
525 | traverseBody(mail,body_desc,body,0,path); | 525 | traverseBody(mail,body_desc,body,0,path); |
526 | } else { | 526 | } else { |
527 | qDebug("error fetching body: %s",m_imap->imap_response); | 527 | odebug << "error fetching body: " << m_imap->imap_response << "" << oendl; |
528 | } | 528 | } |
529 | if (result) mailimap_fetch_list_free(result); | 529 | if (result) mailimap_fetch_list_free(result); |
530 | return body; | 530 | return body; |
531 | } | 531 | } |
532 | 532 | ||
533 | QStringList IMAPwrapper::address_list_to_stringlist(clist*list) | 533 | QStringList IMAPwrapper::address_list_to_stringlist(clist*list) |
534 | { | 534 | { |
535 | QStringList l; | 535 | QStringList l; |
536 | QString from; | 536 | QString from; |
537 | bool named_from; | 537 | bool named_from; |
538 | clistcell *current = NULL; | 538 | clistcell *current = NULL; |
539 | mailimap_address * current_address=NULL; | 539 | mailimap_address * current_address=NULL; |
@@ -627,25 +627,25 @@ encodedString*IMAPwrapper::fetchRawPart(const RecMailP&mail,const QValueList<int | |||
627 | for(cur = clist_begin(msg_att->att_list) ; cur != NULL ; cur = clist_next(cur)) { | 627 | for(cur = clist_begin(msg_att->att_list) ; cur != NULL ; cur = clist_next(cur)) { |
628 | msg_att_item = (mailimap_msg_att_item*)clist_content(cur); | 628 | msg_att_item = (mailimap_msg_att_item*)clist_content(cur); |
629 | if (msg_att_item->att_type == MAILIMAP_MSG_ATT_ITEM_STATIC) { | 629 | if (msg_att_item->att_type == MAILIMAP_MSG_ATT_ITEM_STATIC) { |
630 | if (msg_att_item->att_data.att_static->att_type == MAILIMAP_MSG_ATT_BODY_SECTION) { | 630 | if (msg_att_item->att_data.att_static->att_type == MAILIMAP_MSG_ATT_BODY_SECTION) { |
631 | char*text = msg_att_item->att_data.att_static->att_data.att_body_section->sec_body_part; | 631 | char*text = msg_att_item->att_data.att_static->att_data.att_body_section->sec_body_part; |
632 | /* detach - we take over the content */ | 632 | /* detach - we take over the content */ |
633 | msg_att_item->att_data.att_static->att_data.att_body_section->sec_body_part = 0L; | 633 | msg_att_item->att_data.att_static->att_data.att_body_section->sec_body_part = 0L; |
634 | res->setContent(text,msg_att_item->att_data.att_static->att_data.att_body_section->sec_length); | 634 | res->setContent(text,msg_att_item->att_data.att_static->att_data.att_body_section->sec_length); |
635 | } | 635 | } |
636 | } | 636 | } |
637 | } | 637 | } |
638 | } else { | 638 | } else { |
639 | qDebug("error fetching text: %s",m_imap->imap_response); | 639 | odebug << "error fetching text: " << m_imap->imap_response << "" << oendl; |
640 | } | 640 | } |
641 | if (result) mailimap_fetch_list_free(result); | 641 | if (result) mailimap_fetch_list_free(result); |
642 | return res; | 642 | return res; |
643 | } | 643 | } |
644 | 644 | ||
645 | /* current_recursion is for recursive calls. | 645 | /* current_recursion is for recursive calls. |
646 | current_count means the position inside the internal loop! */ | 646 | current_count means the position inside the internal loop! */ |
647 | void IMAPwrapper::traverseBody(const RecMailP&mail,mailimap_body*body,RecBodyP&target_body, | 647 | void IMAPwrapper::traverseBody(const RecMailP&mail,mailimap_body*body,RecBodyP&target_body, |
648 | int current_recursion,QValueList<int>recList,int current_count) | 648 | int current_recursion,QValueList<int>recList,int current_count) |
649 | { | 649 | { |
650 | if (!body || current_recursion>=10) { | 650 | if (!body || current_recursion>=10) { |
651 | return; | 651 | return; |
@@ -654,25 +654,25 @@ void IMAPwrapper::traverseBody(const RecMailP&mail,mailimap_body*body,RecBodyP&t | |||
654 | case MAILIMAP_BODY_1PART: | 654 | case MAILIMAP_BODY_1PART: |
655 | { | 655 | { |
656 | QValueList<int>countlist = recList; | 656 | QValueList<int>countlist = recList; |
657 | countlist.append(current_count); | 657 | countlist.append(current_count); |
658 | RecPartP currentPart = new RecPart(); | 658 | RecPartP currentPart = new RecPart(); |
659 | mailimap_body_type_1part*part1 = body->bd_data.bd_body_1part; | 659 | mailimap_body_type_1part*part1 = body->bd_data.bd_body_1part; |
660 | QString id(""); | 660 | QString id(""); |
661 | currentPart->setPositionlist(countlist); | 661 | currentPart->setPositionlist(countlist); |
662 | for (unsigned int j = 0; j < countlist.count();++j) { | 662 | for (unsigned int j = 0; j < countlist.count();++j) { |
663 | id+=(j>0?" ":""); | 663 | id+=(j>0?" ":""); |
664 | id+=QString("%1").arg(countlist[j]); | 664 | id+=QString("%1").arg(countlist[j]); |
665 | } | 665 | } |
666 | qDebug("ID = %s",id.latin1()); | 666 | odebug << "ID = " << id.latin1() << "" << oendl; |
667 | currentPart->setIdentifier(id); | 667 | currentPart->setIdentifier(id); |
668 | fillSinglePart(currentPart,part1); | 668 | fillSinglePart(currentPart,part1); |
669 | /* important: Check for is NULL 'cause a body can be empty! | 669 | /* important: Check for is NULL 'cause a body can be empty! |
670 | And we put it only into the mail if it is the FIRST part */ | 670 | And we put it only into the mail if it is the FIRST part */ |
671 | if (part1->bd_type==MAILIMAP_BODY_TYPE_1PART_TEXT && target_body->Bodytext().isNull() && countlist[0]==1) { | 671 | if (part1->bd_type==MAILIMAP_BODY_TYPE_1PART_TEXT && target_body->Bodytext().isNull() && countlist[0]==1) { |
672 | QString body_text = fetchTextPart(mail,countlist,true,currentPart->Encoding()); | 672 | QString body_text = fetchTextPart(mail,countlist,true,currentPart->Encoding()); |
673 | target_body->setDescription(currentPart); | 673 | target_body->setDescription(currentPart); |
674 | target_body->setBodytext(body_text); | 674 | target_body->setBodytext(body_text); |
675 | if (countlist.count()>1) { | 675 | if (countlist.count()>1) { |
676 | target_body->addPart(currentPart); | 676 | target_body->addPart(currentPart); |
677 | } | 677 | } |
678 | } else { | 678 | } else { |
@@ -695,25 +695,25 @@ void IMAPwrapper::traverseBody(const RecMailP&mail,mailimap_body*body,RecBodyP&t | |||
695 | if (current_body->bd_type==MAILIMAP_BODY_MPART) { | 695 | if (current_body->bd_type==MAILIMAP_BODY_MPART) { |
696 | RecPartP targetPart = new RecPart(); | 696 | RecPartP targetPart = new RecPart(); |
697 | targetPart->setType("multipart"); | 697 | targetPart->setType("multipart"); |
698 | fillMultiPart(targetPart,mailDescription); | 698 | fillMultiPart(targetPart,mailDescription); |
699 | countlist.append(current_count); | 699 | countlist.append(current_count); |
700 | targetPart->setPositionlist(countlist); | 700 | targetPart->setPositionlist(countlist); |
701 | target_body->addPart(targetPart); | 701 | target_body->addPart(targetPart); |
702 | QString id(""); | 702 | QString id(""); |
703 | for (unsigned int j = 0; j < countlist.count();++j) { | 703 | for (unsigned int j = 0; j < countlist.count();++j) { |
704 | id+=(j>0?" ":""); | 704 | id+=(j>0?" ":""); |
705 | id+=QString("%1").arg(countlist[j]); | 705 | id+=QString("%1").arg(countlist[j]); |
706 | } | 706 | } |
707 | qDebug("ID(mpart) = %s",id.latin1()); | 707 | odebug << "ID(mpart) = " << id.latin1() << "" << oendl; |
708 | } | 708 | } |
709 | traverseBody(mail,current_body,target_body,current_recursion+1,countlist,ccount); | 709 | traverseBody(mail,current_body,target_body,current_recursion+1,countlist,ccount); |
710 | if (current_body->bd_type==MAILIMAP_BODY_MPART) { | 710 | if (current_body->bd_type==MAILIMAP_BODY_MPART) { |
711 | countlist = recList; | 711 | countlist = recList; |
712 | } | 712 | } |
713 | ++ccount; | 713 | ++ccount; |
714 | } | 714 | } |
715 | } | 715 | } |
716 | break; | 716 | break; |
717 | default: | 717 | default: |
718 | break; | 718 | break; |
719 | } | 719 | } |
@@ -739,37 +739,37 @@ void IMAPwrapper::fillSinglePart(RecPartP&target_part,mailimap_body_type_1part*D | |||
739 | default: | 739 | default: |
740 | break; | 740 | break; |
741 | } | 741 | } |
742 | } | 742 | } |
743 | 743 | ||
744 | void IMAPwrapper::fillSingleTextPart(RecPartP&target_part,mailimap_body_type_text*which) | 744 | void IMAPwrapper::fillSingleTextPart(RecPartP&target_part,mailimap_body_type_text*which) |
745 | { | 745 | { |
746 | if (!which) { | 746 | if (!which) { |
747 | return; | 747 | return; |
748 | } | 748 | } |
749 | QString sub; | 749 | QString sub; |
750 | sub = which->bd_media_text; | 750 | sub = which->bd_media_text; |
751 | qDebug("Type= text/%s",which->bd_media_text); | 751 | odebug << "Type= text/" << which->bd_media_text << "" << oendl; |
752 | target_part->setSubtype(sub.lower()); | 752 | target_part->setSubtype(sub.lower()); |
753 | target_part->setLines(which->bd_lines); | 753 | target_part->setLines(which->bd_lines); |
754 | fillBodyFields(target_part,which->bd_fields); | 754 | fillBodyFields(target_part,which->bd_fields); |
755 | } | 755 | } |
756 | 756 | ||
757 | void IMAPwrapper::fillSingleMsgPart(RecPartP&target_part,mailimap_body_type_msg*which) | 757 | void IMAPwrapper::fillSingleMsgPart(RecPartP&target_part,mailimap_body_type_msg*which) |
758 | { | 758 | { |
759 | if (!which) { | 759 | if (!which) { |
760 | return; | 760 | return; |
761 | } | 761 | } |
762 | target_part->setSubtype("rfc822"); | 762 | target_part->setSubtype("rfc822"); |
763 | qDebug("Message part"); | 763 | odebug << "Message part" << oendl; |
764 | /* we set this type to text/plain */ | 764 | /* we set this type to text/plain */ |
765 | target_part->setLines(which->bd_lines); | 765 | target_part->setLines(which->bd_lines); |
766 | fillBodyFields(target_part,which->bd_fields); | 766 | fillBodyFields(target_part,which->bd_fields); |
767 | } | 767 | } |
768 | 768 | ||
769 | void IMAPwrapper::fillMultiPart(RecPartP&target_part,mailimap_body_type_mpart*which) | 769 | void IMAPwrapper::fillMultiPart(RecPartP&target_part,mailimap_body_type_mpart*which) |
770 | { | 770 | { |
771 | if (!which) return; | 771 | if (!which) return; |
772 | QString sub = which->bd_media_subtype; | 772 | QString sub = which->bd_media_subtype; |
773 | target_part->setSubtype(sub.lower()); | 773 | target_part->setSubtype(sub.lower()); |
774 | if (which->bd_ext_mpart && which->bd_ext_mpart->bd_parameter && which->bd_ext_mpart->bd_parameter->pa_list) { | 774 | if (which->bd_ext_mpart && which->bd_ext_mpart->bd_parameter && which->bd_ext_mpart->bd_parameter->pa_list) { |
775 | clistcell*cur = 0; | 775 | clistcell*cur = 0; |
@@ -810,25 +810,25 @@ void IMAPwrapper::fillSingleBasicPart(RecPartP&target_part,mailimap_body_type_ba | |||
810 | if (which->bd_media_basic->med_basic_type) { | 810 | if (which->bd_media_basic->med_basic_type) { |
811 | type = which->bd_media_basic->med_basic_type; | 811 | type = which->bd_media_basic->med_basic_type; |
812 | } else { | 812 | } else { |
813 | type = ""; | 813 | type = ""; |
814 | } | 814 | } |
815 | break; | 815 | break; |
816 | } | 816 | } |
817 | if (which->bd_media_basic->med_subtype) { | 817 | if (which->bd_media_basic->med_subtype) { |
818 | sub = which->bd_media_basic->med_subtype; | 818 | sub = which->bd_media_basic->med_subtype; |
819 | } else { | 819 | } else { |
820 | sub = ""; | 820 | sub = ""; |
821 | } | 821 | } |
822 | qDebug("Type = %s/%s",type.latin1(),sub.latin1()); | 822 | odebug << "Type = " << type.latin1() << "/" << sub.latin1() << "" << oendl; |
823 | target_part->setType(type.lower()); | 823 | target_part->setType(type.lower()); |
824 | target_part->setSubtype(sub.lower()); | 824 | target_part->setSubtype(sub.lower()); |
825 | fillBodyFields(target_part,which->bd_fields); | 825 | fillBodyFields(target_part,which->bd_fields); |
826 | } | 826 | } |
827 | 827 | ||
828 | void IMAPwrapper::fillBodyFields(RecPartP&target_part,mailimap_body_fields*which) | 828 | void IMAPwrapper::fillBodyFields(RecPartP&target_part,mailimap_body_fields*which) |
829 | { | 829 | { |
830 | if (!which) return; | 830 | if (!which) return; |
831 | if (which->bd_parameter && which->bd_parameter->pa_list && which->bd_parameter->pa_list->count>0) { | 831 | if (which->bd_parameter && which->bd_parameter->pa_list && which->bd_parameter->pa_list->count>0) { |
832 | clistcell*cur; | 832 | clistcell*cur; |
833 | mailimap_single_body_fld_param*param=0; | 833 | mailimap_single_body_fld_param*param=0; |
834 | for (cur = clist_begin(which->bd_parameter->pa_list);cur!=NULL;cur=clist_next(cur)) { | 834 | for (cur = clist_begin(which->bd_parameter->pa_list);cur!=NULL;cur=clist_next(cur)) { |
@@ -886,34 +886,34 @@ void IMAPwrapper::deleteMail(const RecMailP&mail) | |||
886 | if ( err != MAILIMAP_NO_ERROR ) { | 886 | if ( err != MAILIMAP_NO_ERROR ) { |
887 | return; | 887 | return; |
888 | } | 888 | } |
889 | flist = mailimap_flag_list_new_empty(); | 889 | flist = mailimap_flag_list_new_empty(); |
890 | mailimap_flag_list_add(flist,mailimap_flag_new_deleted()); | 890 | mailimap_flag_list_add(flist,mailimap_flag_new_deleted()); |
891 | store_flags = mailimap_store_att_flags_new_set_flags(flist); | 891 | store_flags = mailimap_store_att_flags_new_set_flags(flist); |
892 | set = mailimap_set_new_single(mail->getNumber()); | 892 | set = mailimap_set_new_single(mail->getNumber()); |
893 | err = mailimap_store(m_imap,set,store_flags); | 893 | err = mailimap_store(m_imap,set,store_flags); |
894 | mailimap_set_free( set ); | 894 | mailimap_set_free( set ); |
895 | mailimap_store_att_flags_free(store_flags); | 895 | mailimap_store_att_flags_free(store_flags); |
896 | 896 | ||
897 | if (err != MAILIMAP_NO_ERROR) { | 897 | if (err != MAILIMAP_NO_ERROR) { |
898 | qDebug("error deleting mail: %s",m_imap->imap_response); | 898 | odebug << "error deleting mail: " << m_imap->imap_response << "" << oendl; |
899 | return; | 899 | return; |
900 | } | 900 | } |
901 | qDebug("deleting mail: %s",m_imap->imap_response); | 901 | odebug << "deleting mail: " << m_imap->imap_response << "" << oendl; |
902 | /* should we realy do that at this moment? */ | 902 | /* should we realy do that at this moment? */ |
903 | err = mailimap_expunge(m_imap); | 903 | err = mailimap_expunge(m_imap); |
904 | if (err != MAILIMAP_NO_ERROR) { | 904 | if (err != MAILIMAP_NO_ERROR) { |
905 | qDebug("error deleting mail: %s",m_imap->imap_response); | 905 | odebug << "error deleting mail: " << m_imap->imap_response << "" << oendl; |
906 | } | 906 | } |
907 | qDebug("Delete successfull %s",m_imap->imap_response); | 907 | odebug << "Delete successfull " << m_imap->imap_response << "" << oendl; |
908 | } | 908 | } |
909 | 909 | ||
910 | void IMAPwrapper::answeredMail(const RecMailP&mail) | 910 | void IMAPwrapper::answeredMail(const RecMailP&mail) |
911 | { | 911 | { |
912 | mailimap_flag_list*flist; | 912 | mailimap_flag_list*flist; |
913 | mailimap_set *set; | 913 | mailimap_set *set; |
914 | mailimap_store_att_flags * store_flags; | 914 | mailimap_store_att_flags * store_flags; |
915 | int err; | 915 | int err; |
916 | login(); | 916 | login(); |
917 | if (!m_imap) { | 917 | if (!m_imap) { |
918 | return; | 918 | return; |
919 | } | 919 | } |
@@ -921,25 +921,25 @@ void IMAPwrapper::answeredMail(const RecMailP&mail) | |||
921 | if ( err != MAILIMAP_NO_ERROR ) { | 921 | if ( err != MAILIMAP_NO_ERROR ) { |
922 | return; | 922 | return; |
923 | } | 923 | } |
924 | flist = mailimap_flag_list_new_empty(); | 924 | flist = mailimap_flag_list_new_empty(); |
925 | mailimap_flag_list_add(flist,mailimap_flag_new_answered()); | 925 | mailimap_flag_list_add(flist,mailimap_flag_new_answered()); |
926 | store_flags = mailimap_store_att_flags_new_add_flags(flist); | 926 | store_flags = mailimap_store_att_flags_new_add_flags(flist); |
927 | set = mailimap_set_new_single(mail->getNumber()); | 927 | set = mailimap_set_new_single(mail->getNumber()); |
928 | err = mailimap_store(m_imap,set,store_flags); | 928 | err = mailimap_store(m_imap,set,store_flags); |
929 | mailimap_set_free( set ); | 929 | mailimap_set_free( set ); |
930 | mailimap_store_att_flags_free(store_flags); | 930 | mailimap_store_att_flags_free(store_flags); |
931 | 931 | ||
932 | if (err != MAILIMAP_NO_ERROR) { | 932 | if (err != MAILIMAP_NO_ERROR) { |
933 | qDebug("error marking mail: %s",m_imap->imap_response); | 933 | odebug << "error marking mail: " << m_imap->imap_response << "" << oendl; |
934 | return; | 934 | return; |
935 | } | 935 | } |
936 | } | 936 | } |
937 | 937 | ||
938 | QString IMAPwrapper::fetchTextPart(const RecMailP&mail,const QValueList<int>&path,bool internal_call,const QString&enc) | 938 | QString IMAPwrapper::fetchTextPart(const RecMailP&mail,const QValueList<int>&path,bool internal_call,const QString&enc) |
939 | { | 939 | { |
940 | QString body(""); | 940 | QString body(""); |
941 | encodedString*res = fetchRawPart(mail,path,internal_call); | 941 | encodedString*res = fetchRawPart(mail,path,internal_call); |
942 | encodedString*r = decode_String(res,enc); | 942 | encodedString*r = decode_String(res,enc); |
943 | delete res; | 943 | delete res; |
944 | if (r) { | 944 | if (r) { |
945 | if (r->Length()>0) { | 945 | if (r->Length()>0) { |
@@ -989,57 +989,57 @@ int IMAPwrapper::deleteAllMail(const FolderP&folder) | |||
989 | } | 989 | } |
990 | flist = mailimap_flag_list_new_empty(); | 990 | flist = mailimap_flag_list_new_empty(); |
991 | mailimap_flag_list_add(flist,mailimap_flag_new_deleted()); | 991 | mailimap_flag_list_add(flist,mailimap_flag_new_deleted()); |
992 | store_flags = mailimap_store_att_flags_new_set_flags(flist); | 992 | store_flags = mailimap_store_att_flags_new_set_flags(flist); |
993 | set = mailimap_set_new_interval( 1, last ); | 993 | set = mailimap_set_new_interval( 1, last ); |
994 | err = mailimap_store(m_imap,set,store_flags); | 994 | err = mailimap_store(m_imap,set,store_flags); |
995 | mailimap_set_free( set ); | 995 | mailimap_set_free( set ); |
996 | mailimap_store_att_flags_free(store_flags); | 996 | mailimap_store_att_flags_free(store_flags); |
997 | if (err != MAILIMAP_NO_ERROR) { | 997 | if (err != MAILIMAP_NO_ERROR) { |
998 | Global::statusMessage(tr("error deleting mail: %s").arg(m_imap->imap_response)); | 998 | Global::statusMessage(tr("error deleting mail: %s").arg(m_imap->imap_response)); |
999 | return 0; | 999 | return 0; |
1000 | } | 1000 | } |
1001 | qDebug("deleting mail: %s",m_imap->imap_response); | 1001 | odebug << "deleting mail: " << m_imap->imap_response << "" << oendl; |
1002 | /* should we realy do that at this moment? */ | 1002 | /* should we realy do that at this moment? */ |
1003 | err = mailimap_expunge(m_imap); | 1003 | err = mailimap_expunge(m_imap); |
1004 | if (err != MAILIMAP_NO_ERROR) { | 1004 | if (err != MAILIMAP_NO_ERROR) { |
1005 | Global::statusMessage(tr("error deleting mail: %s").arg(m_imap->imap_response)); | 1005 | Global::statusMessage(tr("error deleting mail: %s").arg(m_imap->imap_response)); |
1006 | return 0; | 1006 | return 0; |
1007 | } | 1007 | } |
1008 | qDebug("Delete successfull %s",m_imap->imap_response); | 1008 | odebug << "Delete successfull " << m_imap->imap_response << "" << oendl; |
1009 | return 1; | 1009 | return 1; |
1010 | } | 1010 | } |
1011 | 1011 | ||
1012 | int IMAPwrapper::createMbox(const QString&folder,const FolderP&parentfolder,const QString& delemiter,bool getsubfolder) | 1012 | int IMAPwrapper::createMbox(const QString&folder,const FolderP&parentfolder,const QString& delemiter,bool getsubfolder) |
1013 | { | 1013 | { |
1014 | if (folder.length()==0) return 0; | 1014 | if (folder.length()==0) return 0; |
1015 | login(); | 1015 | login(); |
1016 | if (!m_imap) {return 0;} | 1016 | if (!m_imap) {return 0;} |
1017 | QString pre = account->getPrefix(); | 1017 | QString pre = account->getPrefix(); |
1018 | if (delemiter.length()>0 && pre.findRev(delemiter)!=pre.length()-1) { | 1018 | if (delemiter.length()>0 && pre.findRev(delemiter)!=pre.length()-1) { |
1019 | pre+=delemiter; | 1019 | pre+=delemiter; |
1020 | } | 1020 | } |
1021 | if (parentfolder) { | 1021 | if (parentfolder) { |
1022 | pre += parentfolder->getDisplayName()+delemiter; | 1022 | pre += parentfolder->getDisplayName()+delemiter; |
1023 | } | 1023 | } |
1024 | pre+=folder; | 1024 | pre+=folder; |
1025 | if (getsubfolder) { | 1025 | if (getsubfolder) { |
1026 | if (delemiter.length()>0) { | 1026 | if (delemiter.length()>0) { |
1027 | pre+=delemiter; | 1027 | pre+=delemiter; |
1028 | } else { | 1028 | } else { |
1029 | Global::statusMessage(tr("Cannot create folder %1 for holding subfolders").arg(pre)); | 1029 | Global::statusMessage(tr("Cannot create folder %1 for holding subfolders").arg(pre)); |
1030 | return 0; | 1030 | return 0; |
1031 | } | 1031 | } |
1032 | } | 1032 | } |
1033 | qDebug("Creating %s",pre.latin1()); | 1033 | odebug << "Creating " << pre.latin1() << "" << oendl; |
1034 | int res = mailimap_create(m_imap,pre.latin1()); | 1034 | int res = mailimap_create(m_imap,pre.latin1()); |
1035 | if (res != MAILIMAP_NO_ERROR) { | 1035 | if (res != MAILIMAP_NO_ERROR) { |
1036 | Global::statusMessage(tr("%1").arg(m_imap->imap_response)); | 1036 | Global::statusMessage(tr("%1").arg(m_imap->imap_response)); |
1037 | return 0; | 1037 | return 0; |
1038 | } | 1038 | } |
1039 | return 1; | 1039 | return 1; |
1040 | } | 1040 | } |
1041 | 1041 | ||
1042 | int IMAPwrapper::deleteMbox(const FolderP&folder) | 1042 | int IMAPwrapper::deleteMbox(const FolderP&folder) |
1043 | { | 1043 | { |
1044 | if (!folder) return 0; | 1044 | if (!folder) return 0; |
1045 | login(); | 1045 | login(); |
@@ -1080,108 +1080,108 @@ void IMAPwrapper::statusFolder(folderStat&target_stat,const QString & mailbox) | |||
1080 | case MAILIMAP_STATUS_ATT_MESSAGES: | 1080 | case MAILIMAP_STATUS_ATT_MESSAGES: |
1081 | target_stat.message_count = status_info->st_value; | 1081 | target_stat.message_count = status_info->st_value; |
1082 | break; | 1082 | break; |
1083 | case MAILIMAP_STATUS_ATT_RECENT: | 1083 | case MAILIMAP_STATUS_ATT_RECENT: |
1084 | target_stat.message_recent = status_info->st_value; | 1084 | target_stat.message_recent = status_info->st_value; |
1085 | break; | 1085 | break; |
1086 | case MAILIMAP_STATUS_ATT_UNSEEN: | 1086 | case MAILIMAP_STATUS_ATT_UNSEEN: |
1087 | target_stat.message_unseen = status_info->st_value; | 1087 | target_stat.message_unseen = status_info->st_value; |
1088 | break; | 1088 | break; |
1089 | } | 1089 | } |
1090 | } | 1090 | } |
1091 | } else { | 1091 | } else { |
1092 | qDebug("Error retrieving status"); | 1092 | odebug << "Error retrieving status" << oendl; |
1093 | } | 1093 | } |
1094 | if (status) mailimap_mailbox_data_status_free(status); | 1094 | if (status) mailimap_mailbox_data_status_free(status); |
1095 | if (att_list) mailimap_status_att_list_free(att_list); | 1095 | if (att_list) mailimap_status_att_list_free(att_list); |
1096 | } | 1096 | } |
1097 | 1097 | ||
1098 | void IMAPwrapper::storeMessage(const char*msg,size_t length, const QString&folder) | 1098 | void IMAPwrapper::storeMessage(const char*msg,size_t length, const QString&folder) |
1099 | { | 1099 | { |
1100 | login(); | 1100 | login(); |
1101 | if (!m_imap) return; | 1101 | if (!m_imap) return; |
1102 | if (!msg) return; | 1102 | if (!msg) return; |
1103 | int r = mailimap_append(m_imap,(char*)folder.latin1(),0,0,msg,length); | 1103 | int r = mailimap_append(m_imap,(char*)folder.latin1(),0,0,msg,length); |
1104 | if (r != MAILIMAP_NO_ERROR) { | 1104 | if (r != MAILIMAP_NO_ERROR) { |
1105 | Global::statusMessage("Error storing mail!"); | 1105 | Global::statusMessage("Error storing mail!"); |
1106 | } | 1106 | } |
1107 | } | 1107 | } |
1108 | 1108 | ||
1109 | MAILLIB::ATYPE IMAPwrapper::getType()const | 1109 | MAILLIB::ATYPE IMAPwrapper::getType()const |
1110 | { | 1110 | { |
1111 | return account->getType(); | 1111 | return account->getType(); |
1112 | } | 1112 | } |
1113 | 1113 | ||
1114 | const QString&IMAPwrapper::getName()const | 1114 | const QString&IMAPwrapper::getName()const |
1115 | { | 1115 | { |
1116 | qDebug("Get name: %s",account->getAccountName().latin1()); | 1116 | odebug << "Get name: " << account->getAccountName().latin1() << "" << oendl; |
1117 | return account->getAccountName(); | 1117 | return account->getAccountName(); |
1118 | } | 1118 | } |
1119 | 1119 | ||
1120 | encodedString* IMAPwrapper::fetchRawBody(const RecMailP&mail) | 1120 | encodedString* IMAPwrapper::fetchRawBody(const RecMailP&mail) |
1121 | { | 1121 | { |
1122 | // dummy | 1122 | // dummy |
1123 | QValueList<int> path; | 1123 | QValueList<int> path; |
1124 | return fetchRawPart(mail,path,false); | 1124 | return fetchRawPart(mail,path,false); |
1125 | } | 1125 | } |
1126 | 1126 | ||
1127 | void IMAPwrapper::mvcpAllMails(const FolderP&fromFolder, | 1127 | void IMAPwrapper::mvcpAllMails(const FolderP&fromFolder, |
1128 | const QString&targetFolder,AbstractMail*targetWrapper,bool moveit) | 1128 | const QString&targetFolder,AbstractMail*targetWrapper,bool moveit) |
1129 | { | 1129 | { |
1130 | if (targetWrapper != this) { | 1130 | if (targetWrapper != this) { |
1131 | AbstractMail::mvcpAllMails(fromFolder,targetFolder,targetWrapper,moveit); | 1131 | AbstractMail::mvcpAllMails(fromFolder,targetFolder,targetWrapper,moveit); |
1132 | qDebug("Using generic"); | 1132 | odebug << "Using generic" << oendl; |
1133 | return; | 1133 | return; |
1134 | } | 1134 | } |
1135 | mailimap_set *set = 0; | 1135 | mailimap_set *set = 0; |
1136 | login(); | 1136 | login(); |
1137 | if (!m_imap) { | 1137 | if (!m_imap) { |
1138 | return; | 1138 | return; |
1139 | } | 1139 | } |
1140 | int err = selectMbox(fromFolder->getName()); | 1140 | int err = selectMbox(fromFolder->getName()); |
1141 | if ( err != MAILIMAP_NO_ERROR ) { | 1141 | if ( err != MAILIMAP_NO_ERROR ) { |
1142 | return; | 1142 | return; |
1143 | } | 1143 | } |
1144 | int last = m_imap->imap_selection_info->sel_exists; | 1144 | int last = m_imap->imap_selection_info->sel_exists; |
1145 | set = mailimap_set_new_interval( 1, last ); | 1145 | set = mailimap_set_new_interval( 1, last ); |
1146 | err = mailimap_copy(m_imap,set,targetFolder.latin1()); | 1146 | err = mailimap_copy(m_imap,set,targetFolder.latin1()); |
1147 | mailimap_set_free( set ); | 1147 | mailimap_set_free( set ); |
1148 | if ( err != MAILIMAP_NO_ERROR ) { | 1148 | if ( err != MAILIMAP_NO_ERROR ) { |
1149 | QString error_msg = tr("error copy mails: %1").arg(m_imap->imap_response); | 1149 | QString error_msg = tr("error copy mails: %1").arg(m_imap->imap_response); |
1150 | Global::statusMessage(error_msg); | 1150 | Global::statusMessage(error_msg); |
1151 | qDebug(error_msg); | 1151 | odebug << error_msg << oendl; |
1152 | return; | 1152 | return; |
1153 | } | 1153 | } |
1154 | if (moveit) { | 1154 | if (moveit) { |
1155 | deleteAllMail(fromFolder); | 1155 | deleteAllMail(fromFolder); |
1156 | } | 1156 | } |
1157 | } | 1157 | } |
1158 | 1158 | ||
1159 | void IMAPwrapper::mvcpMail(const RecMailP&mail,const QString&targetFolder,AbstractMail*targetWrapper,bool moveit) | 1159 | void IMAPwrapper::mvcpMail(const RecMailP&mail,const QString&targetFolder,AbstractMail*targetWrapper,bool moveit) |
1160 | { | 1160 | { |
1161 | if (targetWrapper != this) { | 1161 | if (targetWrapper != this) { |
1162 | qDebug("Using generic"); | 1162 | odebug << "Using generic" << oendl; |
1163 | AbstractMail::mvcpMail(mail,targetFolder,targetWrapper,moveit); | 1163 | AbstractMail::mvcpMail(mail,targetFolder,targetWrapper,moveit); |
1164 | return; | 1164 | return; |
1165 | } | 1165 | } |
1166 | mailimap_set *set = 0; | 1166 | mailimap_set *set = 0; |
1167 | login(); | 1167 | login(); |
1168 | if (!m_imap) { | 1168 | if (!m_imap) { |
1169 | return; | 1169 | return; |
1170 | } | 1170 | } |
1171 | int err = selectMbox(mail->getMbox()); | 1171 | int err = selectMbox(mail->getMbox()); |
1172 | if ( err != MAILIMAP_NO_ERROR ) { | 1172 | if ( err != MAILIMAP_NO_ERROR ) { |
1173 | return; | 1173 | return; |
1174 | } | 1174 | } |
1175 | set = mailimap_set_new_single(mail->getNumber()); | 1175 | set = mailimap_set_new_single(mail->getNumber()); |
1176 | err = mailimap_copy(m_imap,set,targetFolder.latin1()); | 1176 | err = mailimap_copy(m_imap,set,targetFolder.latin1()); |
1177 | mailimap_set_free( set ); | 1177 | mailimap_set_free( set ); |
1178 | if ( err != MAILIMAP_NO_ERROR ) { | 1178 | if ( err != MAILIMAP_NO_ERROR ) { |
1179 | QString error_msg = tr("error copy mail: %1").arg(m_imap->imap_response); | 1179 | QString error_msg = tr("error copy mail: %1").arg(m_imap->imap_response); |
1180 | Global::statusMessage(error_msg); | 1180 | Global::statusMessage(error_msg); |
1181 | qDebug(error_msg); | 1181 | odebug << error_msg << oendl; |
1182 | return; | 1182 | return; |
1183 | } | 1183 | } |
1184 | if (moveit) { | 1184 | if (moveit) { |
1185 | deleteMail(mail); | 1185 | deleteMail(mail); |
1186 | } | 1186 | } |
1187 | } | 1187 | } |
diff --git a/noncore/net/mail/libmailwrapper/logindialog.cpp b/noncore/net/mail/libmailwrapper/logindialog.cpp index 01d177e..c9ae190 100644 --- a/noncore/net/mail/libmailwrapper/logindialog.cpp +++ b/noncore/net/mail/libmailwrapper/logindialog.cpp | |||
@@ -15,15 +15,15 @@ LoginDialog::LoginDialog(const QString&user,const QString&pass, QWidget *parent, | |||
15 | } else { | 15 | } else { |
16 | passLine->setFocus(); | 16 | passLine->setFocus(); |
17 | } | 17 | } |
18 | } | 18 | } |
19 | 19 | ||
20 | void LoginDialog::accept() | 20 | void LoginDialog::accept() |
21 | { | 21 | { |
22 | //_user.replace( 0, _user.length(), userLine->text() ); | 22 | //_user.replace( 0, _user.length(), userLine->text() ); |
23 | //_pass.replace( 0, _pass.length(), passLine->text() ); | 23 | //_pass.replace( 0, _pass.length(), passLine->text() ); |
24 | _user = userLine->text(); | 24 | _user = userLine->text(); |
25 | _pass = passLine->text(); | 25 | _pass = passLine->text(); |
26 | 26 | ||
27 | qDebug("User im accept: |%s|",_user.latin1()); | 27 | odebug << "User im accept: |" << _user.latin1() << "|" << oendl; |
28 | QDialog::accept(); | 28 | QDialog::accept(); |
29 | } | 29 | } |
diff --git a/noncore/net/mail/libmailwrapper/mailtypes.cpp b/noncore/net/mail/libmailwrapper/mailtypes.cpp index 90b8865..6d44db4 100644 --- a/noncore/net/mail/libmailwrapper/mailtypes.cpp +++ b/noncore/net/mail/libmailwrapper/mailtypes.cpp | |||
@@ -4,25 +4,25 @@ | |||
4 | using namespace Opie::Core; | 4 | using namespace Opie::Core; |
5 | RecMail::RecMail() | 5 | RecMail::RecMail() |
6 | :Opie::Core::ORefCount(),subject(""),date(""),from(""),mbox(""),msg_id(""),msg_number(0),msg_size(0),msg_flags(7) | 6 | :Opie::Core::ORefCount(),subject(""),date(""),from(""),mbox(""),msg_id(""),msg_number(0),msg_size(0),msg_flags(7) |
7 | { | 7 | { |
8 | init(); | 8 | init(); |
9 | } | 9 | } |
10 | 10 | ||
11 | RecMail::RecMail(const RecMail&old) | 11 | RecMail::RecMail(const RecMail&old) |
12 | :Opie::Core::ORefCount(),subject(""),date(""),from(""),mbox(""),msg_id(""),msg_number(0),msg_flags(7) | 12 | :Opie::Core::ORefCount(),subject(""),date(""),from(""),mbox(""),msg_id(""),msg_number(0),msg_flags(7) |
13 | { | 13 | { |
14 | init(); | 14 | init(); |
15 | copy_old(old); | 15 | copy_old(old); |
16 | qDebug("Copy constructor RecMail"); | 16 | odebug << "Copy constructor RecMail" << oendl; |
17 | } | 17 | } |
18 | 18 | ||
19 | RecMail::~RecMail() | 19 | RecMail::~RecMail() |
20 | { | 20 | { |
21 | wrapper = 0; | 21 | wrapper = 0; |
22 | } | 22 | } |
23 | 23 | ||
24 | void RecMail::copy_old(const RecMail&old) | 24 | void RecMail::copy_old(const RecMail&old) |
25 | { | 25 | { |
26 | subject = old.subject; | 26 | subject = old.subject; |
27 | date = old.date; | 27 | date = old.date; |
28 | mbox = old.mbox; | 28 | mbox = old.mbox; |
@@ -122,25 +122,25 @@ RecPart::RecPart(const RecPart&old) | |||
122 | : Opie::Core::ORefCount(), | 122 | : Opie::Core::ORefCount(), |
123 | m_type(""),m_subtype(""),m_identifier(""),m_encoding(""),m_description(""),m_lines(0),m_size(0) | 123 | m_type(""),m_subtype(""),m_identifier(""),m_encoding(""),m_description(""),m_lines(0),m_size(0) |
124 | { | 124 | { |
125 | m_type = old.m_type; | 125 | m_type = old.m_type; |
126 | m_subtype = old.m_subtype; | 126 | m_subtype = old.m_subtype; |
127 | m_identifier = old.m_identifier; | 127 | m_identifier = old.m_identifier; |
128 | m_encoding = old.m_encoding; | 128 | m_encoding = old.m_encoding; |
129 | m_description = old.m_description; | 129 | m_description = old.m_description; |
130 | m_lines = old.m_lines; | 130 | m_lines = old.m_lines; |
131 | m_size = old.m_size; | 131 | m_size = old.m_size; |
132 | m_Parameters = old.m_Parameters; | 132 | m_Parameters = old.m_Parameters; |
133 | m_poslist = old.m_poslist; | 133 | m_poslist = old.m_poslist; |
134 | qDebug("RecPart copy constructor"); | 134 | odebug << "RecPart copy constructor" << oendl; |
135 | } | 135 | } |
136 | 136 | ||
137 | RecPart::~RecPart() | 137 | RecPart::~RecPart() |
138 | { | 138 | { |
139 | } | 139 | } |
140 | 140 | ||
141 | void RecPart::setSize(unsigned int size) | 141 | void RecPart::setSize(unsigned int size) |
142 | { | 142 | { |
143 | m_size = size; | 143 | m_size = size; |
144 | } | 144 | } |
145 | 145 | ||
146 | const unsigned int RecPart::Size()const | 146 | const unsigned int RecPart::Size()const |
@@ -246,25 +246,25 @@ const QValueList<int>& RecPart::Positionlist()const | |||
246 | RecBody::RecBody() | 246 | RecBody::RecBody() |
247 | : Opie::Core::ORefCount(),m_BodyText(),m_description(new RecPart()) | 247 | : Opie::Core::ORefCount(),m_BodyText(),m_description(new RecPart()) |
248 | { | 248 | { |
249 | m_PartsList.clear(); | 249 | m_PartsList.clear(); |
250 | } | 250 | } |
251 | 251 | ||
252 | RecBody::RecBody(const RecBody&old) | 252 | RecBody::RecBody(const RecBody&old) |
253 | :Opie::Core::ORefCount(),m_BodyText(),m_PartsList(),m_description(new RecPart()) | 253 | :Opie::Core::ORefCount(),m_BodyText(),m_PartsList(),m_description(new RecPart()) |
254 | { | 254 | { |
255 | m_BodyText = old.m_BodyText; | 255 | m_BodyText = old.m_BodyText; |
256 | m_PartsList = old.m_PartsList; | 256 | m_PartsList = old.m_PartsList; |
257 | m_description = old.m_description; | 257 | m_description = old.m_description; |
258 | qDebug("Recbody copy constructor"); | 258 | odebug << "Recbody copy constructor" << oendl; |
259 | } | 259 | } |
260 | 260 | ||
261 | RecBody::~RecBody() | 261 | RecBody::~RecBody() |
262 | { | 262 | { |
263 | } | 263 | } |
264 | 264 | ||
265 | void RecBody::setBodytext(const QString&bodyText) | 265 | void RecBody::setBodytext(const QString&bodyText) |
266 | { | 266 | { |
267 | m_BodyText = bodyText; | 267 | m_BodyText = bodyText; |
268 | } | 268 | } |
269 | 269 | ||
270 | const QString& RecBody::Bodytext()const | 270 | const QString& RecBody::Bodytext()const |
@@ -311,32 +311,32 @@ encodedString::encodedString(const char*nContent,unsigned int nSize) | |||
311 | } | 311 | } |
312 | 312 | ||
313 | encodedString::encodedString(char*nContent,unsigned int nSize) | 313 | encodedString::encodedString(char*nContent,unsigned int nSize) |
314 | { | 314 | { |
315 | init(); | 315 | init(); |
316 | setContent(nContent,nSize); | 316 | setContent(nContent,nSize); |
317 | } | 317 | } |
318 | 318 | ||
319 | encodedString::encodedString(const encodedString&old) | 319 | encodedString::encodedString(const encodedString&old) |
320 | { | 320 | { |
321 | init(); | 321 | init(); |
322 | copy_old(old); | 322 | copy_old(old); |
323 | qDebug("encodedeString: copy constructor!"); | 323 | odebug << "encodedeString: copy constructor!" << oendl; |
324 | } | 324 | } |
325 | 325 | ||
326 | encodedString& encodedString::operator=(const encodedString&old) | 326 | encodedString& encodedString::operator=(const encodedString&old) |
327 | { | 327 | { |
328 | init(); | 328 | init(); |
329 | copy_old(old); | 329 | copy_old(old); |
330 | qDebug("encodedString: assign operator!"); | 330 | odebug << "encodedString: assign operator!" << oendl; |
331 | return *this; | 331 | return *this; |
332 | } | 332 | } |
333 | 333 | ||
334 | encodedString::~encodedString() | 334 | encodedString::~encodedString() |
335 | { | 335 | { |
336 | clean(); | 336 | clean(); |
337 | } | 337 | } |
338 | 338 | ||
339 | void encodedString::init() | 339 | void encodedString::init() |
340 | { | 340 | { |
341 | content = 0; | 341 | content = 0; |
342 | size = 0; | 342 | size = 0; |
diff --git a/noncore/net/mail/libmailwrapper/mailwrapper.cpp b/noncore/net/mail/libmailwrapper/mailwrapper.cpp index eddc0b9..2b0d112 100644 --- a/noncore/net/mail/libmailwrapper/mailwrapper.cpp +++ b/noncore/net/mail/libmailwrapper/mailwrapper.cpp | |||
@@ -42,25 +42,25 @@ Folder::~Folder() | |||
42 | 42 | ||
43 | const QString& Folder::Separator()const | 43 | const QString& Folder::Separator()const |
44 | { | 44 | { |
45 | return separator; | 45 | return separator; |
46 | } | 46 | } |
47 | 47 | ||
48 | IMAPFolder::IMAPFolder(const QString&name,const QString&sep, bool select,bool no_inf, const QString&aprefix ) | 48 | IMAPFolder::IMAPFolder(const QString&name,const QString&sep, bool select,bool no_inf, const QString&aprefix ) |
49 | : Folder( name,sep ),m_MaySelect(select),m_NoInferior(no_inf) | 49 | : Folder( name,sep ),m_MaySelect(select),m_NoInferior(no_inf) |
50 | { | 50 | { |
51 | // Decode IMAP foldername | 51 | // Decode IMAP foldername |
52 | nameDisplay = IMAPFolder::decodeFolderName( name ); | 52 | nameDisplay = IMAPFolder::decodeFolderName( name ); |
53 | /* | 53 | /* |
54 | qDebug( "folder " + name + " - displayed as " + nameDisplay ); | 54 | odebug << "folder " + name + " - displayed as " + nameDisplay << oendl; |
55 | */ | 55 | */ |
56 | prefix = aprefix; | 56 | prefix = aprefix; |
57 | 57 | ||
58 | if (prefix.length()>0) { | 58 | if (prefix.length()>0) { |
59 | if (nameDisplay.startsWith(prefix) && nameDisplay.length()>prefix.length()) { | 59 | if (nameDisplay.startsWith(prefix) && nameDisplay.length()>prefix.length()) { |
60 | nameDisplay=nameDisplay.right(nameDisplay.length()-prefix.length()); | 60 | nameDisplay=nameDisplay.right(nameDisplay.length()-prefix.length()); |
61 | } | 61 | } |
62 | } | 62 | } |
63 | } | 63 | } |
64 | 64 | ||
65 | IMAPFolder::~IMAPFolder() | 65 | IMAPFolder::~IMAPFolder() |
66 | { | 66 | { |
diff --git a/noncore/net/mail/libmailwrapper/mboxwrapper.cpp b/noncore/net/mail/libmailwrapper/mboxwrapper.cpp index e3c75f3..df2112f 100644 --- a/noncore/net/mail/libmailwrapper/mboxwrapper.cpp +++ b/noncore/net/mail/libmailwrapper/mboxwrapper.cpp | |||
@@ -22,25 +22,25 @@ MBOXwrapper::~MBOXwrapper() | |||
22 | 22 | ||
23 | void MBOXwrapper::listMessages(const QString & mailbox, QValueList<RecMailP> &target ) | 23 | void MBOXwrapper::listMessages(const QString & mailbox, QValueList<RecMailP> &target ) |
24 | { | 24 | { |
25 | mailstorage*storage = mailstorage_new(NULL); | 25 | mailstorage*storage = mailstorage_new(NULL); |
26 | QString p = MBOXPath+"/"; | 26 | QString p = MBOXPath+"/"; |
27 | p+=mailbox; | 27 | p+=mailbox; |
28 | 28 | ||
29 | int r = mbox_mailstorage_init(storage,(char*)p.latin1(),0,0,0); | 29 | int r = mbox_mailstorage_init(storage,(char*)p.latin1(),0,0,0); |
30 | mailfolder*folder; | 30 | mailfolder*folder; |
31 | folder = mailfolder_new( storage,(char*)p.latin1(),NULL); | 31 | folder = mailfolder_new( storage,(char*)p.latin1(),NULL); |
32 | r = mailfolder_connect(folder); | 32 | r = mailfolder_connect(folder); |
33 | if (r != MAIL_NO_ERROR) { | 33 | if (r != MAIL_NO_ERROR) { |
34 | qDebug("Error initializing mbox"); | 34 | odebug << "Error initializing mbox" << oendl; |
35 | mailfolder_free(folder); | 35 | mailfolder_free(folder); |
36 | mailstorage_free(storage); | 36 | mailstorage_free(storage); |
37 | return; | 37 | return; |
38 | } | 38 | } |
39 | 39 | ||
40 | parseList(target,folder->fld_session,mailbox); | 40 | parseList(target,folder->fld_session,mailbox); |
41 | 41 | ||
42 | mailfolder_disconnect(folder); | 42 | mailfolder_disconnect(folder); |
43 | mailfolder_free(folder); | 43 | mailfolder_free(folder); |
44 | mailstorage_free(storage); | 44 | mailstorage_free(storage); |
45 | Global::statusMessage(tr("Mailbox has %1 mail(s)").arg(target.count())); | 45 | Global::statusMessage(tr("Mailbox has %1 mail(s)").arg(target.count())); |
46 | } | 46 | } |
@@ -61,87 +61,87 @@ QValueList<Opie::Core::OSmartPointer<Folder> >* MBOXwrapper::listFolders() | |||
61 | } | 61 | } |
62 | 62 | ||
63 | void MBOXwrapper::deleteMail(const RecMailP & mail) | 63 | void MBOXwrapper::deleteMail(const RecMailP & mail) |
64 | { | 64 | { |
65 | mailstorage*storage = mailstorage_new(NULL); | 65 | mailstorage*storage = mailstorage_new(NULL); |
66 | QString p = MBOXPath+"/"; | 66 | QString p = MBOXPath+"/"; |
67 | p+=mail->getMbox(); | 67 | p+=mail->getMbox(); |
68 | int r = mbox_mailstorage_init(storage,(char*)p.latin1(),0,0,0); | 68 | int r = mbox_mailstorage_init(storage,(char*)p.latin1(),0,0,0); |
69 | mailfolder*folder; | 69 | mailfolder*folder; |
70 | folder = mailfolder_new( storage,(char*)p.latin1(),NULL); | 70 | folder = mailfolder_new( storage,(char*)p.latin1(),NULL); |
71 | r = mailfolder_connect(folder); | 71 | r = mailfolder_connect(folder); |
72 | if (r != MAIL_NO_ERROR) { | 72 | if (r != MAIL_NO_ERROR) { |
73 | qDebug("Error initializing mbox"); | 73 | odebug << "Error initializing mbox" << oendl; |
74 | mailfolder_free(folder); | 74 | mailfolder_free(folder); |
75 | mailstorage_free(storage); | 75 | mailstorage_free(storage); |
76 | return; | 76 | return; |
77 | } | 77 | } |
78 | r = mailsession_remove_message(folder->fld_session,mail->getNumber()); | 78 | r = mailsession_remove_message(folder->fld_session,mail->getNumber()); |
79 | if (r != MAIL_NO_ERROR) { | 79 | if (r != MAIL_NO_ERROR) { |
80 | qDebug("error deleting mail"); | 80 | odebug << "error deleting mail" << oendl; |
81 | } | 81 | } |
82 | mailfolder_free(folder); | 82 | mailfolder_free(folder); |
83 | mailstorage_free(storage); | 83 | mailstorage_free(storage); |
84 | } | 84 | } |
85 | 85 | ||
86 | void MBOXwrapper::answeredMail(const RecMailP&) | 86 | void MBOXwrapper::answeredMail(const RecMailP&) |
87 | { | 87 | { |
88 | } | 88 | } |
89 | 89 | ||
90 | RecBodyP MBOXwrapper::fetchBody( const RecMailP &mail ) | 90 | RecBodyP MBOXwrapper::fetchBody( const RecMailP &mail ) |
91 | { | 91 | { |
92 | RecBodyP body = new RecBody(); | 92 | RecBodyP body = new RecBody(); |
93 | mailstorage*storage = mailstorage_new(NULL); | 93 | mailstorage*storage = mailstorage_new(NULL); |
94 | QString p = MBOXPath+"/"; | 94 | QString p = MBOXPath+"/"; |
95 | p+=mail->getMbox(); | 95 | p+=mail->getMbox(); |
96 | mailmessage * msg; | 96 | mailmessage * msg; |
97 | char*data=0; | 97 | char*data=0; |
98 | size_t size; | 98 | size_t size; |
99 | 99 | ||
100 | int r = mbox_mailstorage_init(storage,(char*)p.latin1(),0,0,0); | 100 | int r = mbox_mailstorage_init(storage,(char*)p.latin1(),0,0,0); |
101 | mailfolder*folder; | 101 | mailfolder*folder; |
102 | folder = mailfolder_new( storage,(char*)p.latin1(),NULL); | 102 | folder = mailfolder_new( storage,(char*)p.latin1(),NULL); |
103 | r = mailfolder_connect(folder); | 103 | r = mailfolder_connect(folder); |
104 | if (r != MAIL_NO_ERROR) { | 104 | if (r != MAIL_NO_ERROR) { |
105 | qDebug("Error initializing mbox"); | 105 | odebug << "Error initializing mbox" << oendl; |
106 | mailfolder_free(folder); | 106 | mailfolder_free(folder); |
107 | mailstorage_free(storage); | 107 | mailstorage_free(storage); |
108 | return body; | 108 | return body; |
109 | } | 109 | } |
110 | r = mailsession_get_message(folder->fld_session, mail->getNumber(), &msg); | 110 | r = mailsession_get_message(folder->fld_session, mail->getNumber(), &msg); |
111 | if (r != MAIL_NO_ERROR) { | 111 | if (r != MAIL_NO_ERROR) { |
112 | qDebug("Error fetching mail %i",mail->getNumber()); | 112 | odebug << "Error fetching mail " << mail->getNumber() << "" << oendl; |
113 | mailfolder_free(folder); | 113 | mailfolder_free(folder); |
114 | mailstorage_free(storage); | 114 | mailstorage_free(storage); |
115 | return body; | 115 | return body; |
116 | } | 116 | } |
117 | r = mailmessage_fetch(msg,&data,&size); | 117 | r = mailmessage_fetch(msg,&data,&size); |
118 | if (r != MAIL_NO_ERROR) { | 118 | if (r != MAIL_NO_ERROR) { |
119 | qDebug("Error fetching mail %i",mail->getNumber()); | 119 | odebug << "Error fetching mail " << mail->getNumber() << "" << oendl; |
120 | mailfolder_free(folder); | 120 | mailfolder_free(folder); |
121 | mailstorage_free(storage); | 121 | mailstorage_free(storage); |
122 | mailmessage_free(msg); | 122 | mailmessage_free(msg); |
123 | return body; | 123 | return body; |
124 | } | 124 | } |
125 | body = parseMail(msg); | 125 | body = parseMail(msg); |
126 | mailmessage_fetch_result_free(msg,data); | 126 | mailmessage_fetch_result_free(msg,data); |
127 | mailfolder_free(folder); | 127 | mailfolder_free(folder); |
128 | mailstorage_free(storage); | 128 | mailstorage_free(storage); |
129 | 129 | ||
130 | return body; | 130 | return body; |
131 | } | 131 | } |
132 | 132 | ||
133 | void MBOXwrapper::mbox_progress( size_t current, size_t maximum ) | 133 | void MBOXwrapper::mbox_progress( size_t current, size_t maximum ) |
134 | { | 134 | { |
135 | qDebug("MBOX %i von %i",current,maximum); | 135 | odebug << "MBOX " << current << " von " << maximum << "" << oendl; |
136 | } | 136 | } |
137 | 137 | ||
138 | int MBOXwrapper::createMbox(const QString&folder,const FolderP&,const QString&,bool ) | 138 | int MBOXwrapper::createMbox(const QString&folder,const FolderP&,const QString&,bool ) |
139 | { | 139 | { |
140 | QString p = MBOXPath+"/"; | 140 | QString p = MBOXPath+"/"; |
141 | p+=folder; | 141 | p+=folder; |
142 | QFileInfo fi(p); | 142 | QFileInfo fi(p); |
143 | if (fi.exists()) { | 143 | if (fi.exists()) { |
144 | Global::statusMessage(tr("Mailbox exists.")); | 144 | Global::statusMessage(tr("Mailbox exists.")); |
145 | return 0; | 145 | return 0; |
146 | } | 146 | } |
147 | mailmbox_folder*f = 0; | 147 | mailmbox_folder*f = 0; |
@@ -211,45 +211,45 @@ encodedString* MBOXwrapper::fetchRawBody(const RecMailP&mail) | |||
211 | mailstorage_free(storage); | 211 | mailstorage_free(storage); |
212 | mailmessage_free(msg); | 212 | mailmessage_free(msg); |
213 | return result; | 213 | return result; |
214 | } | 214 | } |
215 | 215 | ||
216 | void MBOXwrapper::deleteMails(const QString & mailbox,const QValueList<RecMailP> &target) | 216 | void MBOXwrapper::deleteMails(const QString & mailbox,const QValueList<RecMailP> &target) |
217 | { | 217 | { |
218 | QString p = MBOXPath+"/"; | 218 | QString p = MBOXPath+"/"; |
219 | p+=mailbox; | 219 | p+=mailbox; |
220 | mailmbox_folder*f = 0; | 220 | mailmbox_folder*f = 0; |
221 | int r = mailmbox_init(p.latin1(),0,1,0,&f); | 221 | int r = mailmbox_init(p.latin1(),0,1,0,&f); |
222 | if (r != MAIL_NO_ERROR) { | 222 | if (r != MAIL_NO_ERROR) { |
223 | qDebug("Error init folder"); | 223 | odebug << "Error init folder" << oendl; |
224 | return; | 224 | return; |
225 | } | 225 | } |
226 | deleteMails(f,target); | 226 | deleteMails(f,target); |
227 | mailmbox_done(f); | 227 | mailmbox_done(f); |
228 | } | 228 | } |
229 | 229 | ||
230 | void MBOXwrapper::deleteMails(mailmbox_folder*f,const QValueList<RecMailP> &target) | 230 | void MBOXwrapper::deleteMails(mailmbox_folder*f,const QValueList<RecMailP> &target) |
231 | { | 231 | { |
232 | if (!f) return; | 232 | if (!f) return; |
233 | int r; | 233 | int r; |
234 | QValueList<RecMailP>::ConstIterator it; | 234 | QValueList<RecMailP>::ConstIterator it; |
235 | for (it=target.begin(); it != target.end();++it) { | 235 | for (it=target.begin(); it != target.end();++it) { |
236 | r = mailmbox_delete_msg(f,(*it)->getNumber()); | 236 | r = mailmbox_delete_msg(f,(*it)->getNumber()); |
237 | if (r!=MAILMBOX_NO_ERROR) { | 237 | if (r!=MAILMBOX_NO_ERROR) { |
238 | qDebug("error delete mail"); | 238 | odebug << "error delete mail" << oendl; |
239 | } | 239 | } |
240 | } | 240 | } |
241 | r = mailmbox_expunge(f); | 241 | r = mailmbox_expunge(f); |
242 | if (r != MAILMBOX_NO_ERROR) { | 242 | if (r != MAILMBOX_NO_ERROR) { |
243 | qDebug("error expunge mailbox"); | 243 | odebug << "error expunge mailbox" << oendl; |
244 | } | 244 | } |
245 | } | 245 | } |
246 | 246 | ||
247 | int MBOXwrapper::deleteAllMail(const FolderP&tfolder) | 247 | int MBOXwrapper::deleteAllMail(const FolderP&tfolder) |
248 | { | 248 | { |
249 | if (!tfolder) return 0; | 249 | if (!tfolder) return 0; |
250 | QString p = MBOXPath+"/"+tfolder->getDisplayName(); | 250 | QString p = MBOXPath+"/"+tfolder->getDisplayName(); |
251 | int res = 1; | 251 | int res = 1; |
252 | 252 | ||
253 | mailfolder*folder = 0; | 253 | mailfolder*folder = 0; |
254 | mailmessage_list*l=0; | 254 | mailmessage_list*l=0; |
255 | mailstorage*storage = mailstorage_new(NULL); | 255 | mailstorage*storage = mailstorage_new(NULL); |
@@ -260,25 +260,25 @@ int MBOXwrapper::deleteAllMail(const FolderP&tfolder) | |||
260 | } | 260 | } |
261 | if (res) { | 261 | if (res) { |
262 | folder = mailfolder_new( storage,(char*)p.latin1(),NULL); | 262 | folder = mailfolder_new( storage,(char*)p.latin1(),NULL); |
263 | r = mailfolder_connect(folder); | 263 | r = mailfolder_connect(folder); |
264 | if (r != MAIL_NO_ERROR) { | 264 | if (r != MAIL_NO_ERROR) { |
265 | Global::statusMessage(tr("Error initializing mbox")); | 265 | Global::statusMessage(tr("Error initializing mbox")); |
266 | res = 0; | 266 | res = 0; |
267 | } | 267 | } |
268 | } | 268 | } |
269 | if (res) { | 269 | if (res) { |
270 | r = mailsession_get_messages_list(folder->fld_session,&l); | 270 | r = mailsession_get_messages_list(folder->fld_session,&l); |
271 | if (r != MAIL_NO_ERROR) { | 271 | if (r != MAIL_NO_ERROR) { |
272 | qDebug("Error message list"); | 272 | odebug << "Error message list" << oendl; |
273 | res=0; | 273 | res=0; |
274 | } | 274 | } |
275 | } | 275 | } |
276 | for(unsigned int i = 0 ; l!= 0 && res==1 && i < carray_count(l->msg_tab) ; ++i) { | 276 | for(unsigned int i = 0 ; l!= 0 && res==1 && i < carray_count(l->msg_tab) ; ++i) { |
277 | r = mailsession_remove_message(folder->fld_session,i+1); | 277 | r = mailsession_remove_message(folder->fld_session,i+1); |
278 | if (r != MAIL_NO_ERROR) { | 278 | if (r != MAIL_NO_ERROR) { |
279 | Global::statusMessage(tr("Error deleting mail %1").arg(i+1)); | 279 | Global::statusMessage(tr("Error deleting mail %1").arg(i+1)); |
280 | res = 0; | 280 | res = 0; |
281 | break; | 281 | break; |
282 | } | 282 | } |
283 | } | 283 | } |
284 | if (l) mailmessage_list_free(l); | 284 | if (l) mailmessage_list_free(l); |
diff --git a/noncore/net/mail/libmailwrapper/mhwrapper.cpp b/noncore/net/mail/libmailwrapper/mhwrapper.cpp index 12472e9..cd7cecb 100644 --- a/noncore/net/mail/libmailwrapper/mhwrapper.cpp +++ b/noncore/net/mail/libmailwrapper/mhwrapper.cpp | |||
@@ -7,50 +7,50 @@ | |||
7 | #include <stdlib.h> | 7 | #include <stdlib.h> |
8 | #include <qpe/global.h> | 8 | #include <qpe/global.h> |
9 | #include <opie2/oprocess.h> | 9 | #include <opie2/oprocess.h> |
10 | 10 | ||
11 | using namespace Opie::Core; | 11 | using namespace Opie::Core; |
12 | MHwrapper::MHwrapper(const QString & mbox_dir,const QString&mbox_name) | 12 | MHwrapper::MHwrapper(const QString & mbox_dir,const QString&mbox_name) |
13 | : Genericwrapper(),MHPath(mbox_dir),MHName(mbox_name) | 13 | : Genericwrapper(),MHPath(mbox_dir),MHName(mbox_name) |
14 | { | 14 | { |
15 | if (MHPath.length()>0) { | 15 | if (MHPath.length()>0) { |
16 | if (MHPath[MHPath.length()-1]=='/') { | 16 | if (MHPath[MHPath.length()-1]=='/') { |
17 | MHPath=MHPath.left(MHPath.length()-1); | 17 | MHPath=MHPath.left(MHPath.length()-1); |
18 | } | 18 | } |
19 | qDebug(MHPath); | 19 | odebug << MHPath << oendl; |
20 | QDir dir(MHPath); | 20 | QDir dir(MHPath); |
21 | if (!dir.exists()) { | 21 | if (!dir.exists()) { |
22 | dir.mkdir(MHPath); | 22 | dir.mkdir(MHPath); |
23 | } | 23 | } |
24 | init_storage(); | 24 | init_storage(); |
25 | } | 25 | } |
26 | } | 26 | } |
27 | 27 | ||
28 | void MHwrapper::init_storage() | 28 | void MHwrapper::init_storage() |
29 | { | 29 | { |
30 | int r; | 30 | int r; |
31 | QString pre = MHPath; | 31 | QString pre = MHPath; |
32 | if (!m_storage) { | 32 | if (!m_storage) { |
33 | m_storage = mailstorage_new(NULL); | 33 | m_storage = mailstorage_new(NULL); |
34 | r = mh_mailstorage_init(m_storage,(char*)pre.latin1(),0,0,0); | 34 | r = mh_mailstorage_init(m_storage,(char*)pre.latin1(),0,0,0); |
35 | if (r != MAIL_NO_ERROR) { | 35 | if (r != MAIL_NO_ERROR) { |
36 | qDebug("error initializing storage"); | 36 | odebug << "error initializing storage" << oendl; |
37 | mailstorage_free(m_storage); | 37 | mailstorage_free(m_storage); |
38 | m_storage = 0; | 38 | m_storage = 0; |
39 | return; | 39 | return; |
40 | } | 40 | } |
41 | } | 41 | } |
42 | r = mailstorage_connect(m_storage); | 42 | r = mailstorage_connect(m_storage); |
43 | if (r!=MAIL_NO_ERROR) { | 43 | if (r!=MAIL_NO_ERROR) { |
44 | qDebug("error connecting storage"); | 44 | odebug << "error connecting storage" << oendl; |
45 | mailstorage_free(m_storage); | 45 | mailstorage_free(m_storage); |
46 | m_storage = 0; | 46 | m_storage = 0; |
47 | } | 47 | } |
48 | } | 48 | } |
49 | 49 | ||
50 | void MHwrapper::clean_storage() | 50 | void MHwrapper::clean_storage() |
51 | { | 51 | { |
52 | if (m_storage) { | 52 | if (m_storage) { |
53 | mailstorage_disconnect(m_storage); | 53 | mailstorage_disconnect(m_storage); |
54 | mailstorage_free(m_storage); | 54 | mailstorage_free(m_storage); |
55 | m_storage = 0; | 55 | m_storage = 0; |
56 | } | 56 | } |
@@ -61,105 +61,105 @@ MHwrapper::~MHwrapper() | |||
61 | clean_storage(); | 61 | clean_storage(); |
62 | } | 62 | } |
63 | 63 | ||
64 | void MHwrapper::listMessages(const QString & mailbox, QValueList<Opie::Core::OSmartPointer<RecMail> > &target ) | 64 | void MHwrapper::listMessages(const QString & mailbox, QValueList<Opie::Core::OSmartPointer<RecMail> > &target ) |
65 | { | 65 | { |
66 | init_storage(); | 66 | init_storage(); |
67 | if (!m_storage) { | 67 | if (!m_storage) { |
68 | return; | 68 | return; |
69 | } | 69 | } |
70 | QString f = buildPath(mailbox); | 70 | QString f = buildPath(mailbox); |
71 | int r = mailsession_select_folder(m_storage->sto_session,(char*)f.latin1()); | 71 | int r = mailsession_select_folder(m_storage->sto_session,(char*)f.latin1()); |
72 | if (r!=MAIL_NO_ERROR) { | 72 | if (r!=MAIL_NO_ERROR) { |
73 | qDebug("listMessages: error selecting folder!"); | 73 | odebug << "listMessages: error selecting folder!" << oendl; |
74 | return; | 74 | return; |
75 | } | 75 | } |
76 | parseList(target,m_storage->sto_session,f); | 76 | parseList(target,m_storage->sto_session,f); |
77 | Global::statusMessage(tr("Mailbox has %1 mail(s)").arg(target.count())); | 77 | Global::statusMessage(tr("Mailbox has %1 mail(s)").arg(target.count())); |
78 | } | 78 | } |
79 | 79 | ||
80 | QValueList<Opie::Core::OSmartPointer<Folder> >* MHwrapper::listFolders() | 80 | QValueList<Opie::Core::OSmartPointer<Folder> >* MHwrapper::listFolders() |
81 | { | 81 | { |
82 | QValueList<Opie::Core::OSmartPointer<Folder> >* folders = new QValueList<Opie::Core::OSmartPointer<Folder> >(); | 82 | QValueList<Opie::Core::OSmartPointer<Folder> >* folders = new QValueList<Opie::Core::OSmartPointer<Folder> >(); |
83 | /* this is needed! */ | 83 | /* this is needed! */ |
84 | if (m_storage) mailstorage_disconnect(m_storage); | 84 | if (m_storage) mailstorage_disconnect(m_storage); |
85 | init_storage(); | 85 | init_storage(); |
86 | if (!m_storage) { | 86 | if (!m_storage) { |
87 | return folders; | 87 | return folders; |
88 | } | 88 | } |
89 | mail_list*flist = 0; | 89 | mail_list*flist = 0; |
90 | clistcell*current=0; | 90 | clistcell*current=0; |
91 | int r = mailsession_list_folders(m_storage->sto_session,NULL,&flist); | 91 | int r = mailsession_list_folders(m_storage->sto_session,NULL,&flist); |
92 | if (r != MAIL_NO_ERROR || !flist) { | 92 | if (r != MAIL_NO_ERROR || !flist) { |
93 | qDebug("error getting folder list"); | 93 | odebug << "error getting folder list" << oendl; |
94 | return folders; | 94 | return folders; |
95 | } | 95 | } |
96 | for (current=clist_begin(flist->mb_list);current!=0;current=clist_next(current)) { | 96 | for (current=clist_begin(flist->mb_list);current!=0;current=clist_next(current)) { |
97 | QString t = (char*)current->data; | 97 | QString t = (char*)current->data; |
98 | t.replace(0,MHPath.length(),""); | 98 | t.replace(0,MHPath.length(),""); |
99 | folders->append(new MHFolder(t,MHPath)); | 99 | folders->append(new MHFolder(t,MHPath)); |
100 | } | 100 | } |
101 | mail_list_free(flist); | 101 | mail_list_free(flist); |
102 | return folders; | 102 | return folders; |
103 | } | 103 | } |
104 | 104 | ||
105 | void MHwrapper::deleteMail(const RecMailP&mail) | 105 | void MHwrapper::deleteMail(const RecMailP&mail) |
106 | { | 106 | { |
107 | init_storage(); | 107 | init_storage(); |
108 | if (!m_storage) { | 108 | if (!m_storage) { |
109 | return; | 109 | return; |
110 | } | 110 | } |
111 | int r = mailsession_select_folder(m_storage->sto_session,(char*)mail->getMbox().latin1()); | 111 | int r = mailsession_select_folder(m_storage->sto_session,(char*)mail->getMbox().latin1()); |
112 | if (r!=MAIL_NO_ERROR) { | 112 | if (r!=MAIL_NO_ERROR) { |
113 | qDebug("error selecting folder!"); | 113 | odebug << "error selecting folder!" << oendl; |
114 | return; | 114 | return; |
115 | } | 115 | } |
116 | r = mailsession_remove_message(m_storage->sto_session,mail->getNumber()); | 116 | r = mailsession_remove_message(m_storage->sto_session,mail->getNumber()); |
117 | if (r != MAIL_NO_ERROR) { | 117 | if (r != MAIL_NO_ERROR) { |
118 | qDebug("error deleting mail"); | 118 | odebug << "error deleting mail" << oendl; |
119 | } | 119 | } |
120 | } | 120 | } |
121 | 121 | ||
122 | void MHwrapper::answeredMail(const RecMailP&) | 122 | void MHwrapper::answeredMail(const RecMailP&) |
123 | { | 123 | { |
124 | } | 124 | } |
125 | 125 | ||
126 | RecBodyP MHwrapper::fetchBody( const RecMailP &mail ) | 126 | RecBodyP MHwrapper::fetchBody( const RecMailP &mail ) |
127 | { | 127 | { |
128 | RecBodyP body = new RecBody(); | 128 | RecBodyP body = new RecBody(); |
129 | init_storage(); | 129 | init_storage(); |
130 | if (!m_storage) { | 130 | if (!m_storage) { |
131 | return body; | 131 | return body; |
132 | } | 132 | } |
133 | mailmessage * msg; | 133 | mailmessage * msg; |
134 | char*data=0; | 134 | char*data=0; |
135 | 135 | ||
136 | /* mail should hold the complete path! */ | 136 | /* mail should hold the complete path! */ |
137 | int r = mailsession_select_folder(m_storage->sto_session,(char*)mail->getMbox().latin1()); | 137 | int r = mailsession_select_folder(m_storage->sto_session,(char*)mail->getMbox().latin1()); |
138 | if (r != MAIL_NO_ERROR) { | 138 | if (r != MAIL_NO_ERROR) { |
139 | return body; | 139 | return body; |
140 | } | 140 | } |
141 | r = mailsession_get_message(m_storage->sto_session, mail->getNumber(), &msg); | 141 | r = mailsession_get_message(m_storage->sto_session, mail->getNumber(), &msg); |
142 | if (r != MAIL_NO_ERROR) { | 142 | if (r != MAIL_NO_ERROR) { |
143 | qDebug("Error fetching mail %i",mail->getNumber()); | 143 | odebug << "Error fetching mail " << mail->getNumber() << "" << oendl; |
144 | return body; | 144 | return body; |
145 | } | 145 | } |
146 | body = parseMail(msg); | 146 | body = parseMail(msg); |
147 | mailmessage_fetch_result_free(msg,data); | 147 | mailmessage_fetch_result_free(msg,data); |
148 | return body; | 148 | return body; |
149 | } | 149 | } |
150 | 150 | ||
151 | void MHwrapper::mbox_progress( size_t current, size_t maximum ) | 151 | void MHwrapper::mbox_progress( size_t current, size_t maximum ) |
152 | { | 152 | { |
153 | qDebug("MH %i von %i",current,maximum); | 153 | odebug << "MH " << current << " von " << maximum << "" << oendl; |
154 | } | 154 | } |
155 | 155 | ||
156 | QString MHwrapper::buildPath(const QString&p) | 156 | QString MHwrapper::buildPath(const QString&p) |
157 | { | 157 | { |
158 | QString f=""; | 158 | QString f=""; |
159 | if (p.length()==0||p=="/") | 159 | if (p.length()==0||p=="/") |
160 | return MHPath; | 160 | return MHPath; |
161 | if (!p.startsWith(MHPath)) { | 161 | if (!p.startsWith(MHPath)) { |
162 | f+=MHPath; | 162 | f+=MHPath; |
163 | } | 163 | } |
164 | if (!p.startsWith("/")) { | 164 | if (!p.startsWith("/")) { |
165 | f+="/"; | 165 | f+="/"; |
@@ -174,119 +174,119 @@ int MHwrapper::createMbox(const QString&folder,const FolderP&pfolder,const QStri | |||
174 | if (!m_storage) { | 174 | if (!m_storage) { |
175 | return 0; | 175 | return 0; |
176 | } | 176 | } |
177 | QString f; | 177 | QString f; |
178 | if (!pfolder) { | 178 | if (!pfolder) { |
179 | // toplevel folder | 179 | // toplevel folder |
180 | f = buildPath(folder); | 180 | f = buildPath(folder); |
181 | } else { | 181 | } else { |
182 | f = pfolder->getName(); | 182 | f = pfolder->getName(); |
183 | f+="/"; | 183 | f+="/"; |
184 | f+=folder; | 184 | f+=folder; |
185 | } | 185 | } |
186 | qDebug(f); | 186 | odebug << f << oendl; |
187 | int r = mailsession_create_folder(m_storage->sto_session,(char*)f.latin1()); | 187 | int r = mailsession_create_folder(m_storage->sto_session,(char*)f.latin1()); |
188 | if (r != MAIL_NO_ERROR) { | 188 | if (r != MAIL_NO_ERROR) { |
189 | qDebug("error creating folder %i",r); | 189 | odebug << "error creating folder " << r << "" << oendl; |
190 | return 0; | 190 | return 0; |
191 | } | 191 | } |
192 | qDebug("Folder created"); | 192 | odebug << "Folder created" << oendl; |
193 | return 1; | 193 | return 1; |
194 | } | 194 | } |
195 | 195 | ||
196 | void MHwrapper::storeMessage(const char*msg,size_t length, const QString&Folder) | 196 | void MHwrapper::storeMessage(const char*msg,size_t length, const QString&Folder) |
197 | { | 197 | { |
198 | init_storage(); | 198 | init_storage(); |
199 | if (!m_storage) { | 199 | if (!m_storage) { |
200 | return; | 200 | return; |
201 | } | 201 | } |
202 | QString f = buildPath(Folder); | 202 | QString f = buildPath(Folder); |
203 | int r = mailsession_select_folder(m_storage->sto_session,(char*)f.latin1()); | 203 | int r = mailsession_select_folder(m_storage->sto_session,(char*)f.latin1()); |
204 | if (r!=MAIL_NO_ERROR) { | 204 | if (r!=MAIL_NO_ERROR) { |
205 | qDebug("error selecting folder!"); | 205 | odebug << "error selecting folder!" << oendl; |
206 | return; | 206 | return; |
207 | } | 207 | } |
208 | r = mailsession_append_message(m_storage->sto_session,(char*)msg,length); | 208 | r = mailsession_append_message(m_storage->sto_session,(char*)msg,length); |
209 | if (r!=MAIL_NO_ERROR) { | 209 | if (r!=MAIL_NO_ERROR) { |
210 | qDebug("error storing mail"); | 210 | odebug << "error storing mail" << oendl; |
211 | } | 211 | } |
212 | return; | 212 | return; |
213 | } | 213 | } |
214 | 214 | ||
215 | encodedString* MHwrapper::fetchRawBody(const RecMailP&mail) | 215 | encodedString* MHwrapper::fetchRawBody(const RecMailP&mail) |
216 | { | 216 | { |
217 | encodedString*result = 0; | 217 | encodedString*result = 0; |
218 | init_storage(); | 218 | init_storage(); |
219 | if (!m_storage) { | 219 | if (!m_storage) { |
220 | return result; | 220 | return result; |
221 | } | 221 | } |
222 | mailmessage * msg = 0; | 222 | mailmessage * msg = 0; |
223 | char*data=0; | 223 | char*data=0; |
224 | size_t size; | 224 | size_t size; |
225 | int r = mailsession_select_folder(m_storage->sto_session,(char*)mail->getMbox().latin1()); | 225 | int r = mailsession_select_folder(m_storage->sto_session,(char*)mail->getMbox().latin1()); |
226 | if (r!=MAIL_NO_ERROR) { | 226 | if (r!=MAIL_NO_ERROR) { |
227 | qDebug("error selecting folder!"); | 227 | odebug << "error selecting folder!" << oendl; |
228 | return result; | 228 | return result; |
229 | } | 229 | } |
230 | r = mailsession_get_message(m_storage->sto_session, mail->getNumber(), &msg); | 230 | r = mailsession_get_message(m_storage->sto_session, mail->getNumber(), &msg); |
231 | if (r != MAIL_NO_ERROR) { | 231 | if (r != MAIL_NO_ERROR) { |
232 | Global::statusMessage(tr("Error fetching mail %i").arg(mail->getNumber())); | 232 | Global::statusMessage(tr("Error fetching mail %i").arg(mail->getNumber())); |
233 | return 0; | 233 | return 0; |
234 | } | 234 | } |
235 | r = mailmessage_fetch(msg,&data,&size); | 235 | r = mailmessage_fetch(msg,&data,&size); |
236 | if (r != MAIL_NO_ERROR) { | 236 | if (r != MAIL_NO_ERROR) { |
237 | Global::statusMessage(tr("Error fetching mail %i").arg(mail->getNumber())); | 237 | Global::statusMessage(tr("Error fetching mail %i").arg(mail->getNumber())); |
238 | if (msg) mailmessage_free(msg); | 238 | if (msg) mailmessage_free(msg); |
239 | return 0; | 239 | return 0; |
240 | } | 240 | } |
241 | result = new encodedString(data,size); | 241 | result = new encodedString(data,size); |
242 | if (msg) mailmessage_free(msg); | 242 | if (msg) mailmessage_free(msg); |
243 | return result; | 243 | return result; |
244 | } | 244 | } |
245 | 245 | ||
246 | void MHwrapper::deleteMails(const QString & mailbox,const QValueList<RecMailP> &target) | 246 | void MHwrapper::deleteMails(const QString & mailbox,const QValueList<RecMailP> &target) |
247 | { | 247 | { |
248 | QString f = buildPath(mailbox); | 248 | QString f = buildPath(mailbox); |
249 | int r = mailsession_select_folder(m_storage->sto_session,(char*)f.latin1()); | 249 | int r = mailsession_select_folder(m_storage->sto_session,(char*)f.latin1()); |
250 | if (r!=MAIL_NO_ERROR) { | 250 | if (r!=MAIL_NO_ERROR) { |
251 | qDebug("deleteMails: error selecting folder!"); | 251 | odebug << "deleteMails: error selecting folder!" << oendl; |
252 | return; | 252 | return; |
253 | } | 253 | } |
254 | QValueList<RecMailP>::ConstIterator it; | 254 | QValueList<RecMailP>::ConstIterator it; |
255 | for (it=target.begin(); it!=target.end();++it) { | 255 | for (it=target.begin(); it!=target.end();++it) { |
256 | r = mailsession_remove_message(m_storage->sto_session,(*it)->getNumber()); | 256 | r = mailsession_remove_message(m_storage->sto_session,(*it)->getNumber()); |
257 | if (r != MAIL_NO_ERROR) { | 257 | if (r != MAIL_NO_ERROR) { |
258 | qDebug("error deleting mail"); | 258 | odebug << "error deleting mail" << oendl; |
259 | break; | 259 | break; |
260 | } | 260 | } |
261 | } | 261 | } |
262 | } | 262 | } |
263 | 263 | ||
264 | int MHwrapper::deleteAllMail(const FolderP&tfolder) | 264 | int MHwrapper::deleteAllMail(const FolderP&tfolder) |
265 | { | 265 | { |
266 | init_storage(); | 266 | init_storage(); |
267 | if (!m_storage) { | 267 | if (!m_storage) { |
268 | return 0; | 268 | return 0; |
269 | } | 269 | } |
270 | int res = 1; | 270 | int res = 1; |
271 | if (!tfolder) return 0; | 271 | if (!tfolder) return 0; |
272 | int r = mailsession_select_folder(m_storage->sto_session,(char*)tfolder->getName().latin1()); | 272 | int r = mailsession_select_folder(m_storage->sto_session,(char*)tfolder->getName().latin1()); |
273 | if (r!=MAIL_NO_ERROR) { | 273 | if (r!=MAIL_NO_ERROR) { |
274 | qDebug("error selecting folder!"); | 274 | odebug << "error selecting folder!" << oendl; |
275 | return 0; | 275 | return 0; |
276 | } | 276 | } |
277 | mailmessage_list*l=0; | 277 | mailmessage_list*l=0; |
278 | r = mailsession_get_messages_list(m_storage->sto_session,&l); | 278 | r = mailsession_get_messages_list(m_storage->sto_session,&l); |
279 | if (r != MAIL_NO_ERROR) { | 279 | if (r != MAIL_NO_ERROR) { |
280 | qDebug("Error message list"); | 280 | odebug << "Error message list" << oendl; |
281 | res = 0; | 281 | res = 0; |
282 | } | 282 | } |
283 | unsigned j = 0; | 283 | unsigned j = 0; |
284 | for(unsigned int i = 0 ; l!= 0 && res==1 && i < carray_count(l->msg_tab) ; ++i) { | 284 | for(unsigned int i = 0 ; l!= 0 && res==1 && i < carray_count(l->msg_tab) ; ++i) { |
285 | mailmessage * msg; | 285 | mailmessage * msg; |
286 | msg = (mailmessage*)carray_get(l->msg_tab, i); | 286 | msg = (mailmessage*)carray_get(l->msg_tab, i); |
287 | j = msg->msg_index; | 287 | j = msg->msg_index; |
288 | r = mailsession_remove_message(m_storage->sto_session,j); | 288 | r = mailsession_remove_message(m_storage->sto_session,j); |
289 | if (r != MAIL_NO_ERROR) { | 289 | if (r != MAIL_NO_ERROR) { |
290 | Global::statusMessage(tr("Error deleting mail %1").arg(i+1)); | 290 | Global::statusMessage(tr("Error deleting mail %1").arg(i+1)); |
291 | res = 0; | 291 | res = 0; |
292 | break; | 292 | break; |
@@ -299,46 +299,46 @@ int MHwrapper::deleteAllMail(const FolderP&tfolder) | |||
299 | int MHwrapper::deleteMbox(const FolderP&tfolder) | 299 | int MHwrapper::deleteMbox(const FolderP&tfolder) |
300 | { | 300 | { |
301 | init_storage(); | 301 | init_storage(); |
302 | if (!m_storage) { | 302 | if (!m_storage) { |
303 | return 0; | 303 | return 0; |
304 | } | 304 | } |
305 | if (!tfolder) return 0; | 305 | if (!tfolder) return 0; |
306 | if (tfolder->getName()=="/" || tfolder->getName().isEmpty()) return 0; | 306 | if (tfolder->getName()=="/" || tfolder->getName().isEmpty()) return 0; |
307 | 307 | ||
308 | int r = mailsession_delete_folder(m_storage->sto_session,(char*)tfolder->getName().latin1()); | 308 | int r = mailsession_delete_folder(m_storage->sto_session,(char*)tfolder->getName().latin1()); |
309 | 309 | ||
310 | if (r != MAIL_NO_ERROR) { | 310 | if (r != MAIL_NO_ERROR) { |
311 | qDebug("error deleting mail box"); | 311 | odebug << "error deleting mail box" << oendl; |
312 | return 0; | 312 | return 0; |
313 | } | 313 | } |
314 | QString cmd = "rm -rf "+tfolder->getName(); | 314 | QString cmd = "rm -rf "+tfolder->getName(); |
315 | QStringList command; | 315 | QStringList command; |
316 | command << "/bin/sh"; | 316 | command << "/bin/sh"; |
317 | command << "-c"; | 317 | command << "-c"; |
318 | command << cmd.latin1(); | 318 | command << cmd.latin1(); |
319 | OProcess *process = new OProcess(); | 319 | OProcess *process = new OProcess(); |
320 | 320 | ||
321 | connect(process, SIGNAL(processExited(Opie::Core::OProcess*)), | 321 | connect(process, SIGNAL(processExited(Opie::Core::OProcess*)), |
322 | this, SLOT( processEnded(Opie::Core::OProcess*))); | 322 | this, SLOT( processEnded(Opie::Core::OProcess*))); |
323 | connect(process, SIGNAL( receivedStderr(Opie::Core::OProcess*,char*,int)), | 323 | connect(process, SIGNAL( receivedStderr(Opie::Core::OProcess*,char*,int)), |
324 | this, SLOT( oprocessStderr(Opie::Core::OProcess*,char*,int))); | 324 | this, SLOT( oprocessStderr(Opie::Core::OProcess*,char*,int))); |
325 | 325 | ||
326 | *process << command; | 326 | *process << command; |
327 | removeMboxfailed = false; | 327 | removeMboxfailed = false; |
328 | if(!process->start(OProcess::Block, OProcess::All) ) { | 328 | if(!process->start(OProcess::Block, OProcess::All) ) { |
329 | qDebug("could not start process"); | 329 | odebug << "could not start process" << oendl; |
330 | return 0; | 330 | return 0; |
331 | } | 331 | } |
332 | qDebug("mail box deleted"); | 332 | odebug << "mail box deleted" << oendl; |
333 | return 1; | 333 | return 1; |
334 | } | 334 | } |
335 | 335 | ||
336 | void MHwrapper::processEnded(OProcess *p) | 336 | void MHwrapper::processEnded(OProcess *p) |
337 | { | 337 | { |
338 | if (p) delete p; | 338 | if (p) delete p; |
339 | } | 339 | } |
340 | 340 | ||
341 | void MHwrapper::oprocessStderr(OProcess*, char *buffer, int ) | 341 | void MHwrapper::oprocessStderr(OProcess*, char *buffer, int ) |
342 | { | 342 | { |
343 | QString lineStr = buffer; | 343 | QString lineStr = buffer; |
344 | QMessageBox::warning( 0, tr("Error"), lineStr ,tr("Ok") ); | 344 | QMessageBox::warning( 0, tr("Error"), lineStr ,tr("Ok") ); |
@@ -369,74 +369,74 @@ MAILLIB::ATYPE MHwrapper::getType()const | |||
369 | 369 | ||
370 | const QString&MHwrapper::getName()const | 370 | const QString&MHwrapper::getName()const |
371 | { | 371 | { |
372 | return MHName; | 372 | return MHName; |
373 | } | 373 | } |
374 | void MHwrapper::mvcpMail(const RecMailP&mail,const QString&targetFolder,AbstractMail*targetWrapper,bool moveit) | 374 | void MHwrapper::mvcpMail(const RecMailP&mail,const QString&targetFolder,AbstractMail*targetWrapper,bool moveit) |
375 | { | 375 | { |
376 | init_storage(); | 376 | init_storage(); |
377 | if (!m_storage) { | 377 | if (!m_storage) { |
378 | return; | 378 | return; |
379 | } | 379 | } |
380 | if (targetWrapper != this) { | 380 | if (targetWrapper != this) { |
381 | qDebug("Using generic"); | 381 | odebug << "Using generic" << oendl; |
382 | Genericwrapper::mvcpMail(mail,targetFolder,targetWrapper,moveit); | 382 | Genericwrapper::mvcpMail(mail,targetFolder,targetWrapper,moveit); |
383 | return; | 383 | return; |
384 | } | 384 | } |
385 | qDebug("Using internal routines for move/copy"); | 385 | odebug << "Using internal routines for move/copy" << oendl; |
386 | QString tf = buildPath(targetFolder); | 386 | QString tf = buildPath(targetFolder); |
387 | int r = mailsession_select_folder(m_storage->sto_session,(char*)mail->getMbox().latin1()); | 387 | int r = mailsession_select_folder(m_storage->sto_session,(char*)mail->getMbox().latin1()); |
388 | if (r != MAIL_NO_ERROR) { | 388 | if (r != MAIL_NO_ERROR) { |
389 | qDebug("Error selecting source mailbox"); | 389 | odebug << "Error selecting source mailbox" << oendl; |
390 | return; | 390 | return; |
391 | } | 391 | } |
392 | if (moveit) { | 392 | if (moveit) { |
393 | r = mailsession_move_message(m_storage->sto_session,mail->getNumber(),(char*)tf.latin1()); | 393 | r = mailsession_move_message(m_storage->sto_session,mail->getNumber(),(char*)tf.latin1()); |
394 | } else { | 394 | } else { |
395 | r = mailsession_copy_message(m_storage->sto_session,mail->getNumber(),(char*)tf.latin1()); | 395 | r = mailsession_copy_message(m_storage->sto_session,mail->getNumber(),(char*)tf.latin1()); |
396 | } | 396 | } |
397 | if (r != MAIL_NO_ERROR) { | 397 | if (r != MAIL_NO_ERROR) { |
398 | qDebug("Error copy/moving mail internal (%i)",r); | 398 | odebug << "Error copy/moving mail internal (" << r << ")" << oendl; |
399 | } | 399 | } |
400 | } | 400 | } |
401 | 401 | ||
402 | void MHwrapper::mvcpAllMails(const FolderP&fromFolder, | 402 | void MHwrapper::mvcpAllMails(const FolderP&fromFolder, |
403 | const QString&targetFolder,AbstractMail*targetWrapper,bool moveit) | 403 | const QString&targetFolder,AbstractMail*targetWrapper,bool moveit) |
404 | { | 404 | { |
405 | init_storage(); | 405 | init_storage(); |
406 | if (!m_storage) { | 406 | if (!m_storage) { |
407 | return; | 407 | return; |
408 | } | 408 | } |
409 | if (targetWrapper != this) { | 409 | if (targetWrapper != this) { |
410 | qDebug("Using generic"); | 410 | odebug << "Using generic" << oendl; |
411 | Genericwrapper::mvcpAllMails(fromFolder,targetFolder,targetWrapper,moveit); | 411 | Genericwrapper::mvcpAllMails(fromFolder,targetFolder,targetWrapper,moveit); |
412 | return; | 412 | return; |
413 | } | 413 | } |
414 | if (!fromFolder) return; | 414 | if (!fromFolder) return; |
415 | int r = mailsession_select_folder(m_storage->sto_session,(char*)fromFolder->getName().latin1()); | 415 | int r = mailsession_select_folder(m_storage->sto_session,(char*)fromFolder->getName().latin1()); |
416 | if (r!=MAIL_NO_ERROR) { | 416 | if (r!=MAIL_NO_ERROR) { |
417 | qDebug("error selecting source folder!"); | 417 | odebug << "error selecting source folder!" << oendl; |
418 | return; | 418 | return; |
419 | } | 419 | } |
420 | QString tf = buildPath(targetFolder); | 420 | QString tf = buildPath(targetFolder); |
421 | mailmessage_list*l=0; | 421 | mailmessage_list*l=0; |
422 | r = mailsession_get_messages_list(m_storage->sto_session,&l); | 422 | r = mailsession_get_messages_list(m_storage->sto_session,&l); |
423 | if (r != MAIL_NO_ERROR) { | 423 | if (r != MAIL_NO_ERROR) { |
424 | qDebug("Error message list"); | 424 | odebug << "Error message list" << oendl; |
425 | } | 425 | } |
426 | unsigned j = 0; | 426 | unsigned j = 0; |
427 | for(unsigned int i = 0 ; l!= 0 && i < carray_count(l->msg_tab) ; ++i) { | 427 | for(unsigned int i = 0 ; l!= 0 && i < carray_count(l->msg_tab) ; ++i) { |
428 | mailmessage * msg; | 428 | mailmessage * msg; |
429 | msg = (mailmessage*)carray_get(l->msg_tab, i); | 429 | msg = (mailmessage*)carray_get(l->msg_tab, i); |
430 | j = msg->msg_index; | 430 | j = msg->msg_index; |
431 | if (moveit) { | 431 | if (moveit) { |
432 | r = mailsession_move_message(m_storage->sto_session,j,(char*)tf.latin1()); | 432 | r = mailsession_move_message(m_storage->sto_session,j,(char*)tf.latin1()); |
433 | } else { | 433 | } else { |
434 | r = mailsession_copy_message(m_storage->sto_session,j,(char*)tf.latin1()); | 434 | r = mailsession_copy_message(m_storage->sto_session,j,(char*)tf.latin1()); |
435 | } | 435 | } |
436 | if (r != MAIL_NO_ERROR) { | 436 | if (r != MAIL_NO_ERROR) { |
437 | qDebug("Error copy/moving mail internal (%i)",r); | 437 | odebug << "Error copy/moving mail internal (" << r << ")" << oendl; |
438 | break; | 438 | break; |
439 | } | 439 | } |
440 | } | 440 | } |
441 | if (l) mailmessage_list_free(l); | 441 | if (l) mailmessage_list_free(l); |
442 | } | 442 | } |
diff --git a/noncore/net/mail/libmailwrapper/nntpwrapper.cpp b/noncore/net/mail/libmailwrapper/nntpwrapper.cpp index cfded43..5d5011a 100644 --- a/noncore/net/mail/libmailwrapper/nntpwrapper.cpp +++ b/noncore/net/mail/libmailwrapper/nntpwrapper.cpp | |||
@@ -20,42 +20,42 @@ NNTPwrapper::NNTPwrapper( NNTPaccount *a ) | |||
20 | last_msg_id = 0; | 20 | last_msg_id = 0; |
21 | } | 21 | } |
22 | 22 | ||
23 | NNTPwrapper::~NNTPwrapper() { | 23 | NNTPwrapper::~NNTPwrapper() { |
24 | logout(); | 24 | logout(); |
25 | QFile msg_cache(msgTempName); | 25 | QFile msg_cache(msgTempName); |
26 | if (msg_cache.exists()) { | 26 | if (msg_cache.exists()) { |
27 | msg_cache.remove(); | 27 | msg_cache.remove(); |
28 | } | 28 | } |
29 | } | 29 | } |
30 | 30 | ||
31 | void NNTPwrapper::nntp_progress( size_t current, size_t maximum ) { | 31 | void NNTPwrapper::nntp_progress( size_t current, size_t maximum ) { |
32 | qDebug( "NNTP: %i of %i", current, maximum ); | 32 | odebug << "NNTP: " << current << " of " << maximum << "" << oendl; |
33 | } | 33 | } |
34 | 34 | ||
35 | 35 | ||
36 | RecBodyP NNTPwrapper::fetchBody( const RecMailP &mail ) { | 36 | RecBodyP NNTPwrapper::fetchBody( const RecMailP &mail ) { |
37 | int err = NEWSNNTP_NO_ERROR; | 37 | int err = NEWSNNTP_NO_ERROR; |
38 | char *message = 0; | 38 | char *message = 0; |
39 | size_t length = 0; | 39 | size_t length = 0; |
40 | 40 | ||
41 | RecBodyP body = new RecBody(); | 41 | RecBodyP body = new RecBody(); |
42 | login(); | 42 | login(); |
43 | if ( !m_nntp ) { | 43 | if ( !m_nntp ) { |
44 | return body; | 44 | return body; |
45 | } | 45 | } |
46 | 46 | ||
47 | mailmessage * mailmsg; | 47 | mailmessage * mailmsg; |
48 | if (mail->Msgsize()>HARD_MSG_SIZE_LIMIT) { | 48 | if (mail->Msgsize()>HARD_MSG_SIZE_LIMIT) { |
49 | qDebug("Message to large: %i",mail->Msgsize()); | 49 | odebug << "Message to large: " << mail->Msgsize() << "" << oendl; |
50 | return body; | 50 | return body; |
51 | } | 51 | } |
52 | 52 | ||
53 | QFile msg_cache(msgTempName); | 53 | QFile msg_cache(msgTempName); |
54 | 54 | ||
55 | cleanMimeCache(); | 55 | cleanMimeCache(); |
56 | 56 | ||
57 | if (mail->getNumber()!=last_msg_id) { | 57 | if (mail->getNumber()!=last_msg_id) { |
58 | if (msg_cache.exists()) { | 58 | if (msg_cache.exists()) { |
59 | msg_cache.remove(); | 59 | msg_cache.remove(); |
60 | } | 60 | } |
61 | msg_cache.open(IO_ReadWrite|IO_Truncate); | 61 | msg_cache.open(IO_ReadWrite|IO_Truncate); |
@@ -125,25 +125,25 @@ void NNTPwrapper::login() | |||
125 | 125 | ||
126 | user = pass = 0; | 126 | user = pass = 0; |
127 | 127 | ||
128 | if ( ( account->getUser().isEmpty() || account->getPassword().isEmpty() ) && account->getLogin() ) { | 128 | if ( ( account->getUser().isEmpty() || account->getPassword().isEmpty() ) && account->getLogin() ) { |
129 | LoginDialog login( account->getUser(), account->getPassword(), NULL, 0, true ); | 129 | LoginDialog login( account->getUser(), account->getPassword(), NULL, 0, true ); |
130 | login.show(); | 130 | login.show(); |
131 | if ( QDialog::Accepted == login.exec() ) { | 131 | if ( QDialog::Accepted == login.exec() ) { |
132 | // ok | 132 | // ok |
133 | User = login.getUser().latin1(); | 133 | User = login.getUser().latin1(); |
134 | Pass = login.getPassword().latin1(); | 134 | Pass = login.getPassword().latin1(); |
135 | } else { | 135 | } else { |
136 | // cancel | 136 | // cancel |
137 | qDebug( "NNTP: Login canceled" ); | 137 | odebug << "NNTP: Login canceled" << oendl; |
138 | return; | 138 | return; |
139 | } | 139 | } |
140 | } else { | 140 | } else { |
141 | User = account->getUser().latin1(); | 141 | User = account->getUser().latin1(); |
142 | Pass = account->getPassword().latin1(); | 142 | Pass = account->getPassword().latin1(); |
143 | } | 143 | } |
144 | 144 | ||
145 | if (User.isEmpty()) { | 145 | if (User.isEmpty()) { |
146 | user=0; | 146 | user=0; |
147 | pass = 0; | 147 | pass = 0; |
148 | } else { | 148 | } else { |
149 | user=User.latin1(); | 149 | user=User.latin1(); |
@@ -162,25 +162,25 @@ void NNTPwrapper::login() | |||
162 | } else if ( conntypeset == 1 ) { | 162 | } else if ( conntypeset == 1 ) { |
163 | conntype = CONNECTION_TYPE_STARTTLS; | 163 | conntype = CONNECTION_TYPE_STARTTLS; |
164 | } else if ( conntypeset == 0 ) { | 164 | } else if ( conntypeset == 0 ) { |
165 | conntype = CONNECTION_TYPE_TRY_STARTTLS; | 165 | conntype = CONNECTION_TYPE_TRY_STARTTLS; |
166 | } | 166 | } |
167 | 167 | ||
168 | nntp_mailstorage_init(m_nntp,(char*)server, port, NULL, CONNECTION_TYPE_PLAIN, NNTP_AUTH_TYPE_PLAIN, | 168 | nntp_mailstorage_init(m_nntp,(char*)server, port, NULL, CONNECTION_TYPE_PLAIN, NNTP_AUTH_TYPE_PLAIN, |
169 | (char*)user,(char*)pass,0,0,0); | 169 | (char*)user,(char*)pass,0,0,0); |
170 | 170 | ||
171 | err = mailstorage_connect( m_nntp ); | 171 | err = mailstorage_connect( m_nntp ); |
172 | 172 | ||
173 | if (err != NEWSNNTP_NO_ERROR) { | 173 | if (err != NEWSNNTP_NO_ERROR) { |
174 | qDebug( QString( "FEHLERNUMMER %1" ).arg( err ) ); | 174 | odebug << QString( "FEHLERNUMMER %1" ).arg( err ) << oendl; |
175 | // Global::statusMessage(tr("Error initializing folder")); | 175 | // Global::statusMessage(tr("Error initializing folder")); |
176 | mailstorage_free(m_nntp); | 176 | mailstorage_free(m_nntp); |
177 | m_nntp = 0; | 177 | m_nntp = 0; |
178 | 178 | ||
179 | } else { | 179 | } else { |
180 | mailsession * session = m_nntp->sto_session; | 180 | mailsession * session = m_nntp->sto_session; |
181 | newsnntp * news = ( ( nntp_session_state_data * )session->sess_data )->nntp_session; | 181 | newsnntp * news = ( ( nntp_session_state_data * )session->sess_data )->nntp_session; |
182 | news->nntp_progr_fun = &nntp_progress; | 182 | news->nntp_progr_fun = &nntp_progress; |
183 | } | 183 | } |
184 | 184 | ||
185 | } | 185 | } |
186 | 186 | ||
diff --git a/noncore/net/mail/libmailwrapper/pop3wrapper.cpp b/noncore/net/mail/libmailwrapper/pop3wrapper.cpp index 5467547..c586c29 100644 --- a/noncore/net/mail/libmailwrapper/pop3wrapper.cpp +++ b/noncore/net/mail/libmailwrapper/pop3wrapper.cpp | |||
@@ -19,42 +19,42 @@ POP3wrapper::POP3wrapper( POP3account *a ) | |||
19 | last_msg_id = 0; | 19 | last_msg_id = 0; |
20 | } | 20 | } |
21 | 21 | ||
22 | POP3wrapper::~POP3wrapper() { | 22 | POP3wrapper::~POP3wrapper() { |
23 | logout(); | 23 | logout(); |
24 | QFile msg_cache(msgTempName); | 24 | QFile msg_cache(msgTempName); |
25 | if (msg_cache.exists()) { | 25 | if (msg_cache.exists()) { |
26 | msg_cache.remove(); | 26 | msg_cache.remove(); |
27 | } | 27 | } |
28 | } | 28 | } |
29 | 29 | ||
30 | void POP3wrapper::pop3_progress( size_t current, size_t maximum ) { | 30 | void POP3wrapper::pop3_progress( size_t current, size_t maximum ) { |
31 | qDebug( "POP3: %i of %i", current, maximum ); | 31 | odebug << "POP3: " << current << " of " << maximum << "" << oendl; |
32 | } | 32 | } |
33 | 33 | ||
34 | RecBodyP POP3wrapper::fetchBody( const RecMailP &mail ) { | 34 | RecBodyP POP3wrapper::fetchBody( const RecMailP &mail ) { |
35 | int err = MAILPOP3_NO_ERROR; | 35 | int err = MAILPOP3_NO_ERROR; |
36 | char *message = 0; | 36 | char *message = 0; |
37 | size_t length = 0; | 37 | size_t length = 0; |
38 | 38 | ||
39 | RecBodyP body = new RecBody(); | 39 | RecBodyP body = new RecBody(); |
40 | 40 | ||
41 | login(); | 41 | login(); |
42 | if ( !m_pop3 ) { | 42 | if ( !m_pop3 ) { |
43 | return body; | 43 | return body; |
44 | } | 44 | } |
45 | 45 | ||
46 | mailmessage * mailmsg; | 46 | mailmessage * mailmsg; |
47 | if (mail->Msgsize()>HARD_MSG_SIZE_LIMIT) { | 47 | if (mail->Msgsize()>HARD_MSG_SIZE_LIMIT) { |
48 | qDebug("Message to large: %i",mail->Msgsize()); | 48 | odebug << "Message to large: " << mail->Msgsize() << "" << oendl; |
49 | return body; | 49 | return body; |
50 | } | 50 | } |
51 | 51 | ||
52 | QFile msg_cache(msgTempName); | 52 | QFile msg_cache(msgTempName); |
53 | 53 | ||
54 | cleanMimeCache(); | 54 | cleanMimeCache(); |
55 | 55 | ||
56 | if (mail->getNumber()!=last_msg_id) { | 56 | if (mail->getNumber()!=last_msg_id) { |
57 | if (msg_cache.exists()) { | 57 | if (msg_cache.exists()) { |
58 | msg_cache.remove(); | 58 | msg_cache.remove(); |
59 | } | 59 | } |
60 | msg_cache.open(IO_ReadWrite|IO_Truncate); | 60 | msg_cache.open(IO_ReadWrite|IO_Truncate); |
@@ -121,25 +121,25 @@ void POP3wrapper::login() | |||
121 | server = account->getServer().latin1(); | 121 | server = account->getServer().latin1(); |
122 | port = account->getPort().toUInt(); | 122 | port = account->getPort().toUInt(); |
123 | 123 | ||
124 | if ( account->getUser().isEmpty() || account->getPassword().isEmpty() ) { | 124 | if ( account->getUser().isEmpty() || account->getPassword().isEmpty() ) { |
125 | LoginDialog login( account->getUser(), account->getPassword(), NULL, 0, true ); | 125 | LoginDialog login( account->getUser(), account->getPassword(), NULL, 0, true ); |
126 | login.show(); | 126 | login.show(); |
127 | if ( QDialog::Accepted == login.exec() ) { | 127 | if ( QDialog::Accepted == login.exec() ) { |
128 | // ok | 128 | // ok |
129 | user = login.getUser().latin1(); | 129 | user = login.getUser().latin1(); |
130 | pass = login.getPassword().latin1(); | 130 | pass = login.getPassword().latin1(); |
131 | } else { | 131 | } else { |
132 | // cancel | 132 | // cancel |
133 | qDebug( "POP3: Login canceled" ); | 133 | odebug << "POP3: Login canceled" << oendl; |
134 | return; | 134 | return; |
135 | } | 135 | } |
136 | } else { | 136 | } else { |
137 | user = account->getUser().latin1(); | 137 | user = account->getUser().latin1(); |
138 | pass = account->getPassword().latin1(); | 138 | pass = account->getPassword().latin1(); |
139 | } | 139 | } |
140 | 140 | ||
141 | // bool ssl = account->getSSL(); | 141 | // bool ssl = account->getSSL(); |
142 | 142 | ||
143 | m_pop3=mailstorage_new(NULL); | 143 | m_pop3=mailstorage_new(NULL); |
144 | 144 | ||
145 | int conntypeset = account->ConnectionType(); | 145 | int conntypeset = account->ConnectionType(); |
@@ -153,25 +153,25 @@ void POP3wrapper::login() | |||
153 | } else if ( conntypeset == 0 ) { | 153 | } else if ( conntypeset == 0 ) { |
154 | conntype = CONNECTION_TYPE_TRY_STARTTLS; | 154 | conntype = CONNECTION_TYPE_TRY_STARTTLS; |
155 | } | 155 | } |
156 | 156 | ||
157 | //(ssl?CONNECTION_TYPE_TLS:CONNECTION_TYPE_PLAIN); | 157 | //(ssl?CONNECTION_TYPE_TLS:CONNECTION_TYPE_PLAIN); |
158 | 158 | ||
159 | pop3_mailstorage_init(m_pop3,(char*)server, port, NULL, conntype, POP3_AUTH_TYPE_PLAIN, | 159 | pop3_mailstorage_init(m_pop3,(char*)server, port, NULL, conntype, POP3_AUTH_TYPE_PLAIN, |
160 | (char*)user,(char*)pass,0,0,0); | 160 | (char*)user,(char*)pass,0,0,0); |
161 | 161 | ||
162 | 162 | ||
163 | err = mailstorage_connect(m_pop3); | 163 | err = mailstorage_connect(m_pop3); |
164 | if (err != MAIL_NO_ERROR) { | 164 | if (err != MAIL_NO_ERROR) { |
165 | qDebug( QString( "FEHLERNUMMER %1" ).arg( err ) ); | 165 | odebug << QString( "FEHLERNUMMER %1" ).arg( err ) << oendl; |
166 | Global::statusMessage(tr("Error initializing folder")); | 166 | Global::statusMessage(tr("Error initializing folder")); |
167 | mailstorage_free(m_pop3); | 167 | mailstorage_free(m_pop3); |
168 | m_pop3 = 0; | 168 | m_pop3 = 0; |
169 | } else { | 169 | } else { |
170 | mailsession * session = m_pop3->sto_session; | 170 | mailsession * session = m_pop3->sto_session; |
171 | mailpop3 * mail = ( ( pop3_session_state_data * )session->sess_data )->pop3_session; | 171 | mailpop3 * mail = ( ( pop3_session_state_data * )session->sess_data )->pop3_session; |
172 | if (mail) { | 172 | if (mail) { |
173 | mail->pop3_progr_fun = &pop3_progress; | 173 | mail->pop3_progr_fun = &pop3_progress; |
174 | } | 174 | } |
175 | } | 175 | } |
176 | } | 176 | } |
177 | 177 | ||
@@ -227,25 +227,25 @@ int POP3wrapper::deleteAllMail(const FolderP&) { | |||
227 | } | 227 | } |
228 | 228 | ||
229 | void POP3wrapper::statusFolder(folderStat&target_stat,const QString&) { | 229 | void POP3wrapper::statusFolder(folderStat&target_stat,const QString&) { |
230 | login(); | 230 | login(); |
231 | target_stat.message_count = 0; | 231 | target_stat.message_count = 0; |
232 | target_stat.message_unseen = 0; | 232 | target_stat.message_unseen = 0; |
233 | target_stat.message_recent = 0; | 233 | target_stat.message_recent = 0; |
234 | if (!m_pop3) | 234 | if (!m_pop3) |
235 | return; | 235 | return; |
236 | int r = mailsession_status_folder(m_pop3->sto_session,0,&target_stat.message_count, | 236 | int r = mailsession_status_folder(m_pop3->sto_session,0,&target_stat.message_count, |
237 | &target_stat.message_recent,&target_stat.message_unseen); | 237 | &target_stat.message_recent,&target_stat.message_unseen); |
238 | if (r != MAIL_NO_ERROR) { | 238 | if (r != MAIL_NO_ERROR) { |
239 | qDebug("error getting folter status."); | 239 | odebug << "error getting folter status." << oendl; |
240 | } | 240 | } |
241 | } | 241 | } |
242 | 242 | ||
243 | encodedString* POP3wrapper::fetchRawBody(const RecMailP&mail) { | 243 | encodedString* POP3wrapper::fetchRawBody(const RecMailP&mail) { |
244 | char*target=0; | 244 | char*target=0; |
245 | size_t length=0; | 245 | size_t length=0; |
246 | encodedString*res = 0; | 246 | encodedString*res = 0; |
247 | mailmessage * mailmsg = 0; | 247 | mailmessage * mailmsg = 0; |
248 | int err = mailsession_get_message(m_pop3->sto_session, mail->getNumber(), &mailmsg); | 248 | int err = mailsession_get_message(m_pop3->sto_session, mail->getNumber(), &mailmsg); |
249 | err = mailmessage_fetch(mailmsg,&target,&length); | 249 | err = mailmessage_fetch(mailmsg,&target,&length); |
250 | if (mailmsg) | 250 | if (mailmsg) |
251 | mailmessage_free(mailmsg); | 251 | mailmessage_free(mailmsg); |
diff --git a/noncore/net/mail/libmailwrapper/settings.cpp b/noncore/net/mail/libmailwrapper/settings.cpp index 2c81963..de36eeb 100644 --- a/noncore/net/mail/libmailwrapper/settings.cpp +++ b/noncore/net/mail/libmailwrapper/settings.cpp | |||
@@ -17,25 +17,25 @@ | |||
17 | 17 | ||
18 | 18 | ||
19 | Settings::Settings() | 19 | Settings::Settings() |
20 | : QObject() | 20 | : QObject() |
21 | { | 21 | { |
22 | updateAccounts(); | 22 | updateAccounts(); |
23 | } | 23 | } |
24 | 24 | ||
25 | void Settings::checkDirectory() | 25 | void Settings::checkDirectory() |
26 | { | 26 | { |
27 | if ( !QDir( (QString) getenv( "HOME" ) + "/Applications/opiemail/" ).exists() ) { | 27 | if ( !QDir( (QString) getenv( "HOME" ) + "/Applications/opiemail/" ).exists() ) { |
28 | system( "mkdir -p $HOME/Applications/opiemail" ); | 28 | system( "mkdir -p $HOME/Applications/opiemail" ); |
29 | qDebug( "$HOME/Applications/opiemail created" ); | 29 | odebug << "$HOME/Applications/opiemail created" << oendl; |
30 | } | 30 | } |
31 | } | 31 | } |
32 | 32 | ||
33 | QList<Account> Settings::getAccounts() | 33 | QList<Account> Settings::getAccounts() |
34 | { | 34 | { |
35 | return accounts; | 35 | return accounts; |
36 | } | 36 | } |
37 | 37 | ||
38 | void Settings::addAccount( Account *account ) | 38 | void Settings::addAccount( Account *account ) |
39 | { | 39 | { |
40 | accounts.append( account ); | 40 | accounts.append( account ); |
41 | } | 41 | } |
@@ -45,46 +45,46 @@ void Settings::delAccount( Account *account ) | |||
45 | accounts.remove( account ); | 45 | accounts.remove( account ); |
46 | account->remove(); | 46 | account->remove(); |
47 | } | 47 | } |
48 | 48 | ||
49 | void Settings::updateAccounts() | 49 | void Settings::updateAccounts() |
50 | { | 50 | { |
51 | accounts.clear(); | 51 | accounts.clear(); |
52 | QDir dir( (QString) getenv( "HOME" ) + "/Applications/opiemail" ); | 52 | QDir dir( (QString) getenv( "HOME" ) + "/Applications/opiemail" ); |
53 | QStringList::Iterator it; | 53 | QStringList::Iterator it; |
54 | 54 | ||
55 | QStringList imap = dir.entryList( "imap-*" ); | 55 | QStringList imap = dir.entryList( "imap-*" ); |
56 | for ( it = imap.begin(); it != imap.end(); it++ ) { | 56 | for ( it = imap.begin(); it != imap.end(); it++ ) { |
57 | qDebug( "Added IMAP account" ); | 57 | odebug << "Added IMAP account" << oendl; |
58 | IMAPaccount *account = new IMAPaccount( (*it).replace(0, 5, "") ); | 58 | IMAPaccount *account = new IMAPaccount( (*it).replace(0, 5, "") ); |
59 | accounts.append( account ); | 59 | accounts.append( account ); |
60 | } | 60 | } |
61 | 61 | ||
62 | QStringList pop3 = dir.entryList( "pop3-*" ); | 62 | QStringList pop3 = dir.entryList( "pop3-*" ); |
63 | for ( it = pop3.begin(); it != pop3.end(); it++ ) { | 63 | for ( it = pop3.begin(); it != pop3.end(); it++ ) { |
64 | qDebug( "Added POP account" ); | 64 | odebug << "Added POP account" << oendl; |
65 | POP3account *account = new POP3account( (*it).replace(0, 5, "") ); | 65 | POP3account *account = new POP3account( (*it).replace(0, 5, "") ); |
66 | accounts.append( account ); | 66 | accounts.append( account ); |
67 | } | 67 | } |
68 | 68 | ||
69 | QStringList smtp = dir.entryList( "smtp-*" ); | 69 | QStringList smtp = dir.entryList( "smtp-*" ); |
70 | for ( it = smtp.begin(); it != smtp.end(); it++ ) { | 70 | for ( it = smtp.begin(); it != smtp.end(); it++ ) { |
71 | qDebug( "Added SMTP account" ); | 71 | odebug << "Added SMTP account" << oendl; |
72 | SMTPaccount *account = new SMTPaccount( (*it).replace(0, 5, "") ); | 72 | SMTPaccount *account = new SMTPaccount( (*it).replace(0, 5, "") ); |
73 | accounts.append( account ); | 73 | accounts.append( account ); |
74 | } | 74 | } |
75 | 75 | ||
76 | QStringList nntp = dir.entryList( "nntp-*" ); | 76 | QStringList nntp = dir.entryList( "nntp-*" ); |
77 | for ( it = nntp.begin(); it != nntp.end(); it++ ) { | 77 | for ( it = nntp.begin(); it != nntp.end(); it++ ) { |
78 | qDebug( "Added NNTP account" ); | 78 | odebug << "Added NNTP account" << oendl; |
79 | NNTPaccount *account = new NNTPaccount( (*it).replace(0, 5, "") ); | 79 | NNTPaccount *account = new NNTPaccount( (*it).replace(0, 5, "") ); |
80 | accounts.append( account ); | 80 | accounts.append( account ); |
81 | } | 81 | } |
82 | 82 | ||
83 | readAccounts(); | 83 | readAccounts(); |
84 | } | 84 | } |
85 | 85 | ||
86 | void Settings::saveAccounts() | 86 | void Settings::saveAccounts() |
87 | { | 87 | { |
88 | checkDirectory(); | 88 | checkDirectory(); |
89 | Account *it; | 89 | Account *it; |
90 | 90 | ||
@@ -170,25 +170,25 @@ void IMAPaccount::read() | |||
170 | user = conf->readEntry( "User","" ); | 170 | user = conf->readEntry( "User","" ); |
171 | if (user.isNull()) user = ""; | 171 | if (user.isNull()) user = ""; |
172 | password = conf->readEntryCrypt( "Password","" ); | 172 | password = conf->readEntryCrypt( "Password","" ); |
173 | if (password.isNull()) password = ""; | 173 | if (password.isNull()) password = ""; |
174 | prefix = conf->readEntry("MailPrefix",""); | 174 | prefix = conf->readEntry("MailPrefix",""); |
175 | if (prefix.isNull()) prefix = ""; | 175 | if (prefix.isNull()) prefix = ""; |
176 | offline = conf->readBoolEntry("Offline",false); | 176 | offline = conf->readBoolEntry("Offline",false); |
177 | delete conf; | 177 | delete conf; |
178 | } | 178 | } |
179 | 179 | ||
180 | void IMAPaccount::save() | 180 | void IMAPaccount::save() |
181 | { | 181 | { |
182 | qDebug( "saving " + getFileName() ); | 182 | odebug << "saving " + getFileName() << oendl; |
183 | Settings::checkDirectory(); | 183 | Settings::checkDirectory(); |
184 | 184 | ||
185 | Config *conf = new Config( getFileName(), Config::File ); | 185 | Config *conf = new Config( getFileName(), Config::File ); |
186 | conf->setGroup( "IMAP Account" ); | 186 | conf->setGroup( "IMAP Account" ); |
187 | conf->writeEntry( "Account", accountName ); | 187 | conf->writeEntry( "Account", accountName ); |
188 | conf->writeEntry( "Server", server ); | 188 | conf->writeEntry( "Server", server ); |
189 | conf->writeEntry( "Port", port ); | 189 | conf->writeEntry( "Port", port ); |
190 | conf->writeEntry( "SSL", ssl ); | 190 | conf->writeEntry( "SSL", ssl ); |
191 | conf->writeEntry( "ConnectionType", connectionType ); | 191 | conf->writeEntry( "ConnectionType", connectionType ); |
192 | conf->writeEntry( "User", user ); | 192 | conf->writeEntry( "User", user ); |
193 | conf->writeEntryCrypt( "Password", password ); | 193 | conf->writeEntryCrypt( "Password", password ); |
194 | conf->writeEntry( "MailPrefix",prefix); | 194 | conf->writeEntry( "MailPrefix",prefix); |
@@ -248,25 +248,25 @@ void POP3account::read() | |||
248 | server = conf->readEntry( "Server" ); | 248 | server = conf->readEntry( "Server" ); |
249 | port = conf->readEntry( "Port" ); | 249 | port = conf->readEntry( "Port" ); |
250 | ssl = conf->readBoolEntry( "SSL" ); | 250 | ssl = conf->readBoolEntry( "SSL" ); |
251 | connectionType = conf->readNumEntry( "ConnectionType" ); | 251 | connectionType = conf->readNumEntry( "ConnectionType" ); |
252 | user = conf->readEntry( "User" ); | 252 | user = conf->readEntry( "User" ); |
253 | password = conf->readEntryCrypt( "Password" ); | 253 | password = conf->readEntryCrypt( "Password" ); |
254 | offline = conf->readBoolEntry("Offline",false); | 254 | offline = conf->readBoolEntry("Offline",false); |
255 | delete conf; | 255 | delete conf; |
256 | } | 256 | } |
257 | 257 | ||
258 | void POP3account::save() | 258 | void POP3account::save() |
259 | { | 259 | { |
260 | qDebug( "saving " + getFileName() ); | 260 | odebug << "saving " + getFileName() << oendl; |
261 | Settings::checkDirectory(); | 261 | Settings::checkDirectory(); |
262 | 262 | ||
263 | Config *conf = new Config( getFileName(), Config::File ); | 263 | Config *conf = new Config( getFileName(), Config::File ); |
264 | conf->setGroup( "POP3 Account" ); | 264 | conf->setGroup( "POP3 Account" ); |
265 | conf->writeEntry( "Account", accountName ); | 265 | conf->writeEntry( "Account", accountName ); |
266 | conf->writeEntry( "Server", server ); | 266 | conf->writeEntry( "Server", server ); |
267 | conf->writeEntry( "Port", port ); | 267 | conf->writeEntry( "Port", port ); |
268 | conf->writeEntry( "SSL", ssl ); | 268 | conf->writeEntry( "SSL", ssl ); |
269 | conf->writeEntry( "ConnectionType", connectionType ); | 269 | conf->writeEntry( "ConnectionType", connectionType ); |
270 | conf->writeEntry( "User", user ); | 270 | conf->writeEntry( "User", user ); |
271 | conf->writeEntryCrypt( "Password", password ); | 271 | conf->writeEntryCrypt( "Password", password ); |
272 | conf->writeEntry( "Offline",offline); | 272 | conf->writeEntry( "Offline",offline); |
@@ -330,25 +330,25 @@ void SMTPaccount::read() | |||
330 | server = conf->readEntry( "Server" ); | 330 | server = conf->readEntry( "Server" ); |
331 | port = conf->readEntry( "Port" ); | 331 | port = conf->readEntry( "Port" ); |
332 | ssl = conf->readBoolEntry( "SSL" ); | 332 | ssl = conf->readBoolEntry( "SSL" ); |
333 | connectionType = conf->readNumEntry( "ConnectionType" ); | 333 | connectionType = conf->readNumEntry( "ConnectionType" ); |
334 | login = conf->readBoolEntry( "Login" ); | 334 | login = conf->readBoolEntry( "Login" ); |
335 | user = conf->readEntry( "User" ); | 335 | user = conf->readEntry( "User" ); |
336 | password = conf->readEntryCrypt( "Password" ); | 336 | password = conf->readEntryCrypt( "Password" ); |
337 | delete conf; | 337 | delete conf; |
338 | } | 338 | } |
339 | 339 | ||
340 | void SMTPaccount::save() | 340 | void SMTPaccount::save() |
341 | { | 341 | { |
342 | qDebug( "saving " + getFileName() ); | 342 | odebug << "saving " + getFileName() << oendl; |
343 | Settings::checkDirectory(); | 343 | Settings::checkDirectory(); |
344 | 344 | ||
345 | Config *conf = new Config( getFileName(), Config::File ); | 345 | Config *conf = new Config( getFileName(), Config::File ); |
346 | conf->setGroup( "SMTP Account" ); | 346 | conf->setGroup( "SMTP Account" ); |
347 | conf->writeEntry( "Account", accountName ); | 347 | conf->writeEntry( "Account", accountName ); |
348 | conf->writeEntry( "Server", server ); | 348 | conf->writeEntry( "Server", server ); |
349 | conf->writeEntry( "Port", port ); | 349 | conf->writeEntry( "Port", port ); |
350 | conf->writeEntry( "SSL", ssl ); | 350 | conf->writeEntry( "SSL", ssl ); |
351 | conf->writeEntry( "ConnectionType", connectionType ); | 351 | conf->writeEntry( "ConnectionType", connectionType ); |
352 | conf->writeEntry( "Login", login ); | 352 | conf->writeEntry( "Login", login ); |
353 | conf->writeEntry( "User", user ); | 353 | conf->writeEntry( "User", user ); |
354 | conf->writeEntryCrypt( "Password", password ); | 354 | conf->writeEntryCrypt( "Password", password ); |
@@ -407,25 +407,25 @@ void NNTPaccount::read() | |||
407 | server = conf->readEntry( "Server" ); | 407 | server = conf->readEntry( "Server" ); |
408 | port = conf->readEntry( "Port" ); | 408 | port = conf->readEntry( "Port" ); |
409 | ssl = conf->readBoolEntry( "SSL" ); | 409 | ssl = conf->readBoolEntry( "SSL" ); |
410 | login = conf->readBoolEntry( "Login" ); | 410 | login = conf->readBoolEntry( "Login" ); |
411 | user = conf->readEntry( "User" ); | 411 | user = conf->readEntry( "User" ); |
412 | password = conf->readEntryCrypt( "Password" ); | 412 | password = conf->readEntryCrypt( "Password" ); |
413 | subscribedGroups = conf->readListEntry( "Subscribed", ',' ); | 413 | subscribedGroups = conf->readListEntry( "Subscribed", ',' ); |
414 | delete conf; | 414 | delete conf; |
415 | } | 415 | } |
416 | 416 | ||
417 | void NNTPaccount::save() | 417 | void NNTPaccount::save() |
418 | { | 418 | { |
419 | qDebug( "saving " + getFileName() ); | 419 | odebug << "saving " + getFileName() << oendl; |
420 | Settings::checkDirectory(); | 420 | Settings::checkDirectory(); |
421 | 421 | ||
422 | Config *conf = new Config( getFileName(), Config::File ); | 422 | Config *conf = new Config( getFileName(), Config::File ); |
423 | conf->setGroup( "NNTP Account" ); | 423 | conf->setGroup( "NNTP Account" ); |
424 | conf->writeEntry( "Account", accountName ); | 424 | conf->writeEntry( "Account", accountName ); |
425 | conf->writeEntry( "Server", server ); | 425 | conf->writeEntry( "Server", server ); |
426 | conf->writeEntry( "Port", port ); | 426 | conf->writeEntry( "Port", port ); |
427 | conf->writeEntry( "SSL", ssl ); | 427 | conf->writeEntry( "SSL", ssl ); |
428 | conf->writeEntry( "Login", login ); | 428 | conf->writeEntry( "Login", login ); |
429 | conf->writeEntry( "User", user ); | 429 | conf->writeEntry( "User", user ); |
430 | conf->writeEntryCrypt( "Password", password ); | 430 | conf->writeEntryCrypt( "Password", password ); |
431 | conf->writeEntry( "Subscribed" , subscribedGroups, ',' ); | 431 | conf->writeEntry( "Subscribed" , subscribedGroups, ',' ); |
diff --git a/noncore/net/mail/libmailwrapper/smtpwrapper.cpp b/noncore/net/mail/libmailwrapper/smtpwrapper.cpp index e2cea7a..ba78c3b 100644 --- a/noncore/net/mail/libmailwrapper/smtpwrapper.cpp +++ b/noncore/net/mail/libmailwrapper/smtpwrapper.cpp | |||
@@ -106,25 +106,25 @@ void SMTPwrapper::smtpSend( mailmime *mail,bool later) { | |||
106 | 106 | ||
107 | from = data = 0; | 107 | from = data = 0; |
108 | 108 | ||
109 | mailmessage * msg = 0; | 109 | mailmessage * msg = 0; |
110 | msg = mime_message_init(mail); | 110 | msg = mime_message_init(mail); |
111 | mime_message_set_tmpdir(msg,getenv( "HOME" )); | 111 | mime_message_set_tmpdir(msg,getenv( "HOME" )); |
112 | int r = mailmessage_fetch(msg,&data,&size); | 112 | int r = mailmessage_fetch(msg,&data,&size); |
113 | mime_message_detach_mime(msg); | 113 | mime_message_detach_mime(msg); |
114 | mailmessage_free(msg); | 114 | mailmessage_free(msg); |
115 | if (r != MAIL_NO_ERROR || !data) { | 115 | if (r != MAIL_NO_ERROR || !data) { |
116 | if (data) | 116 | if (data) |
117 | free(data); | 117 | free(data); |
118 | qDebug("Error fetching mime..."); | 118 | odebug << "Error fetching mime..." << oendl; |
119 | return; | 119 | return; |
120 | } | 120 | } |
121 | msg = 0; | 121 | msg = 0; |
122 | if (later) { | 122 | if (later) { |
123 | storeMail(data,size,"Outgoing"); | 123 | storeMail(data,size,"Outgoing"); |
124 | if (data) | 124 | if (data) |
125 | free( data ); | 125 | free( data ); |
126 | Config cfg( "mail" ); | 126 | Config cfg( "mail" ); |
127 | cfg.setGroup( "Status" ); | 127 | cfg.setGroup( "Status" ); |
128 | cfg.writeEntry( "outgoing", ++m_queuedMail ); | 128 | cfg.writeEntry( "outgoing", ++m_queuedMail ); |
129 | emit queuedMails( m_queuedMail ); | 129 | emit queuedMails( m_queuedMail ); |
130 | return; | 130 | return; |
@@ -199,34 +199,34 @@ void SMTPwrapper::connect_server() | |||
199 | } | 199 | } |
200 | int result = 1; | 200 | int result = 1; |
201 | port = m_SmtpAccount->getPort().toUInt(); | 201 | port = m_SmtpAccount->getPort().toUInt(); |
202 | 202 | ||
203 | m_smtp = mailsmtp_new( 20, &progress ); | 203 | m_smtp = mailsmtp_new( 20, &progress ); |
204 | if ( m_smtp == NULL ) { | 204 | if ( m_smtp == NULL ) { |
205 | /* no failure message cause this happens when problems with memory - than we | 205 | /* no failure message cause this happens when problems with memory - than we |
206 | we can not display any messagebox */ | 206 | we can not display any messagebox */ |
207 | return; | 207 | return; |
208 | } | 208 | } |
209 | 209 | ||
210 | int err = MAILSMTP_NO_ERROR; | 210 | int err = MAILSMTP_NO_ERROR; |
211 | qDebug( "Servername %s at port %i", server, port ); | 211 | odebug << "Servername " << server << " at port " << port << "" << oendl; |
212 | if ( ssl ) { | 212 | if ( ssl ) { |
213 | qDebug( "SSL session" ); | 213 | odebug << "SSL session" << oendl; |
214 | err = mailsmtp_ssl_connect( m_smtp, server, port ); | 214 | err = mailsmtp_ssl_connect( m_smtp, server, port ); |
215 | } else { | 215 | } else { |
216 | qDebug( "No SSL session" ); | 216 | odebug << "No SSL session" << oendl; |
217 | err = mailsmtp_socket_connect( m_smtp, server, port ); | 217 | err = mailsmtp_socket_connect( m_smtp, server, port ); |
218 | } | 218 | } |
219 | if ( err != MAILSMTP_NO_ERROR ) { | 219 | if ( err != MAILSMTP_NO_ERROR ) { |
220 | qDebug("Error init connection"); | 220 | odebug << "Error init connection" << oendl; |
221 | failuretext = tr("Error init SMTP connection: %1").arg(mailsmtpError(err)); | 221 | failuretext = tr("Error init SMTP connection: %1").arg(mailsmtpError(err)); |
222 | result = 0; | 222 | result = 0; |
223 | } | 223 | } |
224 | 224 | ||
225 | /* switch to tls after init 'cause there it will send the ehlo */ | 225 | /* switch to tls after init 'cause there it will send the ehlo */ |
226 | if (result) { | 226 | if (result) { |
227 | err = mailsmtp_init( m_smtp ); | 227 | err = mailsmtp_init( m_smtp ); |
228 | if (err != MAILSMTP_NO_ERROR) { | 228 | if (err != MAILSMTP_NO_ERROR) { |
229 | result = 0; | 229 | result = 0; |
230 | failuretext = tr("Error init SMTP connection: %1").arg(mailsmtpError(err)); | 230 | failuretext = tr("Error init SMTP connection: %1").arg(mailsmtpError(err)); |
231 | } | 231 | } |
232 | } | 232 | } |
@@ -237,47 +237,47 @@ void SMTPwrapper::connect_server() | |||
237 | try_tls = false; | 237 | try_tls = false; |
238 | } else { | 238 | } else { |
239 | err = mailesmtp_ehlo(m_smtp); | 239 | err = mailesmtp_ehlo(m_smtp); |
240 | } | 240 | } |
241 | } | 241 | } |
242 | 242 | ||
243 | if (!try_tls && force_tls) { | 243 | if (!try_tls && force_tls) { |
244 | result = 0; | 244 | result = 0; |
245 | failuretext = tr("Error init SMTP tls: %1").arg(mailsmtpError(err)); | 245 | failuretext = tr("Error init SMTP tls: %1").arg(mailsmtpError(err)); |
246 | } | 246 | } |
247 | 247 | ||
248 | if (result==1 && m_SmtpAccount->getLogin() ) { | 248 | if (result==1 && m_SmtpAccount->getLogin() ) { |
249 | qDebug("smtp with auth"); | 249 | odebug << "smtp with auth" << oendl; |
250 | if ( m_SmtpAccount->getUser().isEmpty() || m_SmtpAccount->getPassword().isEmpty() ) { | 250 | if ( m_SmtpAccount->getUser().isEmpty() || m_SmtpAccount->getPassword().isEmpty() ) { |
251 | // get'em | 251 | // get'em |
252 | LoginDialog login( m_SmtpAccount->getUser(), | 252 | LoginDialog login( m_SmtpAccount->getUser(), |
253 | m_SmtpAccount->getPassword(), NULL, 0, true ); | 253 | m_SmtpAccount->getPassword(), NULL, 0, true ); |
254 | login.show(); | 254 | login.show(); |
255 | if ( QDialog::Accepted == login.exec() ) { | 255 | if ( QDialog::Accepted == login.exec() ) { |
256 | // ok | 256 | // ok |
257 | user = login.getUser().latin1(); | 257 | user = login.getUser().latin1(); |
258 | pass = login.getPassword().latin1(); | 258 | pass = login.getPassword().latin1(); |
259 | } else { | 259 | } else { |
260 | result = 0; | 260 | result = 0; |
261 | failuretext=tr("Login aborted - storing mail to localfolder"); | 261 | failuretext=tr("Login aborted - storing mail to localfolder"); |
262 | } | 262 | } |
263 | } else { | 263 | } else { |
264 | user = m_SmtpAccount->getUser().latin1(); | 264 | user = m_SmtpAccount->getUser().latin1(); |
265 | pass = m_SmtpAccount->getPassword().latin1(); | 265 | pass = m_SmtpAccount->getPassword().latin1(); |
266 | } | 266 | } |
267 | qDebug( "session->auth: %i", m_smtp->auth); | 267 | odebug << "session->auth: " << m_smtp->auth << "" << oendl; |
268 | if (result) { | 268 | if (result) { |
269 | err = mailsmtp_auth( m_smtp, (char*)user, (char*)pass ); | 269 | err = mailsmtp_auth( m_smtp, (char*)user, (char*)pass ); |
270 | if ( err == MAILSMTP_NO_ERROR ) { | 270 | if ( err == MAILSMTP_NO_ERROR ) { |
271 | qDebug("auth ok"); | 271 | odebug << "auth ok" << oendl; |
272 | } else { | 272 | } else { |
273 | failuretext = tr("Authentification failed"); | 273 | failuretext = tr("Authentification failed"); |
274 | result = 0; | 274 | result = 0; |
275 | } | 275 | } |
276 | } | 276 | } |
277 | } | 277 | } |
278 | } | 278 | } |
279 | 279 | ||
280 | void SMTPwrapper::disc_server() | 280 | void SMTPwrapper::disc_server() |
281 | { | 281 | { |
282 | if (m_smtp) { | 282 | if (m_smtp) { |
283 | mailsmtp_quit( m_smtp ); | 283 | mailsmtp_quit( m_smtp ); |
@@ -298,43 +298,43 @@ int SMTPwrapper::smtpSend(char*from,clist*rcpts,const char*data,size_t size ) | |||
298 | err = mailsmtp_send( m_smtp, from, rcpts, data, size ); | 298 | err = mailsmtp_send( m_smtp, from, rcpts, data, size ); |
299 | if ( err != MAILSMTP_NO_ERROR ) { | 299 | if ( err != MAILSMTP_NO_ERROR ) { |
300 | failuretext=tr("Error sending mail: %1").arg(mailsmtpError(err)); | 300 | failuretext=tr("Error sending mail: %1").arg(mailsmtpError(err)); |
301 | result = 0; | 301 | result = 0; |
302 | } | 302 | } |
303 | } else { | 303 | } else { |
304 | result = 0; | 304 | result = 0; |
305 | } | 305 | } |
306 | 306 | ||
307 | if (!result) { | 307 | if (!result) { |
308 | storeFailedMail(data,size,failuretext); | 308 | storeFailedMail(data,size,failuretext); |
309 | } else { | 309 | } else { |
310 | qDebug( "Mail sent." ); | 310 | odebug << "Mail sent." << oendl; |
311 | storeMail(data,size,"Sent"); | 311 | storeMail(data,size,"Sent"); |
312 | } | 312 | } |
313 | return result; | 313 | return result; |
314 | } | 314 | } |
315 | 315 | ||
316 | void SMTPwrapper::sendMail(const Opie::Core::OSmartPointer<Mail>&mail,bool later ) | 316 | void SMTPwrapper::sendMail(const Opie::Core::OSmartPointer<Mail>&mail,bool later ) |
317 | { | 317 | { |
318 | mailmime * mimeMail; | 318 | mailmime * mimeMail; |
319 | 319 | ||
320 | mimeMail = createMimeMail(mail ); | 320 | mimeMail = createMimeMail(mail ); |
321 | if ( mimeMail == NULL ) { | 321 | if ( mimeMail == NULL ) { |
322 | qDebug( "sendMail: error creating mime mail" ); | 322 | odebug << "sendMail: error creating mime mail" << oendl; |
323 | } else { | 323 | } else { |
324 | sendProgress = new progressMailSend(); | 324 | sendProgress = new progressMailSend(); |
325 | sendProgress->show(); | 325 | sendProgress->show(); |
326 | sendProgress->setMaxMails(1); | 326 | sendProgress->setMaxMails(1); |
327 | smtpSend( mimeMail,later); | 327 | smtpSend( mimeMail,later); |
328 | qDebug("Clean up done"); | 328 | odebug << "Clean up done" << oendl; |
329 | sendProgress->hide(); | 329 | sendProgress->hide(); |
330 | delete sendProgress; | 330 | delete sendProgress; |
331 | sendProgress = 0; | 331 | sendProgress = 0; |
332 | mailmime_free( mimeMail ); | 332 | mailmime_free( mimeMail ); |
333 | } | 333 | } |
334 | } | 334 | } |
335 | 335 | ||
336 | int SMTPwrapper::sendQueuedMail(AbstractMail*wrap,const RecMailP&which) { | 336 | int SMTPwrapper::sendQueuedMail(AbstractMail*wrap,const RecMailP&which) { |
337 | size_t curTok = 0; | 337 | size_t curTok = 0; |
338 | mailimf_fields *fields = 0; | 338 | mailimf_fields *fields = 0; |
339 | mailimf_field*ffrom = 0; | 339 | mailimf_field*ffrom = 0; |
340 | clist *rcpts = 0; | 340 | clist *rcpts = 0; |
@@ -369,45 +369,45 @@ int SMTPwrapper::sendQueuedMail(AbstractMail*wrap,const RecMailP&which) { | |||
369 | free(from); | 369 | free(from); |
370 | } | 370 | } |
371 | if (rcpts) { | 371 | if (rcpts) { |
372 | smtp_address_list_free( rcpts ); | 372 | smtp_address_list_free( rcpts ); |
373 | } | 373 | } |
374 | return res; | 374 | return res; |
375 | } | 375 | } |
376 | 376 | ||
377 | /* this is a special fun */ | 377 | /* this is a special fun */ |
378 | bool SMTPwrapper::flushOutbox() { | 378 | bool SMTPwrapper::flushOutbox() { |
379 | bool returnValue = true; | 379 | bool returnValue = true; |
380 | 380 | ||
381 | qDebug("Sending the queue"); | 381 | odebug << "Sending the queue" << oendl; |
382 | if (!m_SmtpAccount) { | 382 | if (!m_SmtpAccount) { |
383 | qDebug("No smtp account given"); | 383 | odebug << "No smtp account given" << oendl; |
384 | return false; | 384 | return false; |
385 | } | 385 | } |
386 | 386 | ||
387 | bool reset_user_value = false; | 387 | bool reset_user_value = false; |
388 | QString localfolders = AbstractMail::defaultLocalfolder(); | 388 | QString localfolders = AbstractMail::defaultLocalfolder(); |
389 | AbstractMail*wrap = AbstractMail::getWrapper(localfolders); | 389 | AbstractMail*wrap = AbstractMail::getWrapper(localfolders); |
390 | if (!wrap) { | 390 | if (!wrap) { |
391 | qDebug("memory error"); | 391 | odebug << "memory error" << oendl; |
392 | return false; | 392 | return false; |
393 | } | 393 | } |
394 | QString oldPw, oldUser; | 394 | QString oldPw, oldUser; |
395 | QValueList<RecMailP> mailsToSend; | 395 | QValueList<RecMailP> mailsToSend; |
396 | QValueList<RecMailP> mailsToRemove; | 396 | QValueList<RecMailP> mailsToRemove; |
397 | QString mbox("Outgoing"); | 397 | QString mbox("Outgoing"); |
398 | wrap->listMessages(mbox,mailsToSend); | 398 | wrap->listMessages(mbox,mailsToSend); |
399 | if (mailsToSend.count()==0) { | 399 | if (mailsToSend.count()==0) { |
400 | delete wrap; | 400 | delete wrap; |
401 | qDebug("No mails to send"); | 401 | odebug << "No mails to send" << oendl; |
402 | return false; | 402 | return false; |
403 | } | 403 | } |
404 | 404 | ||
405 | oldPw = m_SmtpAccount->getPassword(); | 405 | oldPw = m_SmtpAccount->getPassword(); |
406 | oldUser = m_SmtpAccount->getUser(); | 406 | oldUser = m_SmtpAccount->getUser(); |
407 | if (m_SmtpAccount->getLogin() && (m_SmtpAccount->getUser().isEmpty() || m_SmtpAccount->getPassword().isEmpty()) ) { | 407 | if (m_SmtpAccount->getLogin() && (m_SmtpAccount->getUser().isEmpty() || m_SmtpAccount->getPassword().isEmpty()) ) { |
408 | // get'em | 408 | // get'em |
409 | QString user,pass; | 409 | QString user,pass; |
410 | LoginDialog login( m_SmtpAccount->getUser(), m_SmtpAccount->getPassword(), NULL, 0, true ); | 410 | LoginDialog login( m_SmtpAccount->getUser(), m_SmtpAccount->getPassword(), NULL, 0, true ); |
411 | login.show(); | 411 | login.show(); |
412 | if ( QDialog::Accepted == login.exec() ) { | 412 | if ( QDialog::Accepted == login.exec() ) { |
413 | // ok | 413 | // ok |
diff --git a/noncore/net/mail/libmailwrapper/statusmail.cpp b/noncore/net/mail/libmailwrapper/statusmail.cpp index b78244d..51383f6 100644 --- a/noncore/net/mail/libmailwrapper/statusmail.cpp +++ b/noncore/net/mail/libmailwrapper/statusmail.cpp | |||
@@ -34,25 +34,25 @@ void StatusMail::initAccounts(QList<Account>&accounts) | |||
34 | currentImapStat.message_count+=currentStat.message_unseen; | 34 | currentImapStat.message_count+=currentStat.message_unseen; |
35 | currentImapStat.message_count+=currentStat.message_recent; | 35 | currentImapStat.message_count+=currentStat.message_recent; |
36 | currentImapStat.message_count+=currentStat.message_count; | 36 | currentImapStat.message_count+=currentStat.message_count; |
37 | } else if ( it->getType() == MAILLIB::A_POP3 && !it->getOffline() ) { | 37 | } else if ( it->getType() == MAILLIB::A_POP3 && !it->getOffline() ) { |
38 | POP3account *pop3 = static_cast<POP3account *>(it); | 38 | POP3account *pop3 = static_cast<POP3account *>(it); |
39 | current = AbstractMail::getWrapper(pop3); | 39 | current = AbstractMail::getWrapper(pop3); |
40 | connectionList.append(current); | 40 | connectionList.append(current); |
41 | current->statusFolder(currentStat); | 41 | current->statusFolder(currentStat); |
42 | currentPop3Stat.message_count+=currentStat.message_count; | 42 | currentPop3Stat.message_count+=currentStat.message_count; |
43 | } | 43 | } |
44 | current->logout(); | 44 | current->logout(); |
45 | } | 45 | } |
46 | qDebug("Pop3 init count: %i",currentPop3Stat.message_count); | 46 | odebug << "Pop3 init count: " << currentPop3Stat.message_count << "" << oendl; |
47 | currentPop3Stat.message_recent = currentPop3Stat.message_unseen = 0; | 47 | currentPop3Stat.message_recent = currentPop3Stat.message_unseen = 0; |
48 | lastPop3Stat.message_unseen = currentPop3Stat.message_unseen; | 48 | lastPop3Stat.message_unseen = currentPop3Stat.message_unseen; |
49 | lastPop3Stat.message_recent = currentPop3Stat.message_recent; | 49 | lastPop3Stat.message_recent = currentPop3Stat.message_recent; |
50 | lastPop3Stat.message_count = currentPop3Stat.message_count; | 50 | lastPop3Stat.message_count = currentPop3Stat.message_count; |
51 | } | 51 | } |
52 | 52 | ||
53 | void StatusMail::reset_status() | 53 | void StatusMail::reset_status() |
54 | { | 54 | { |
55 | lastPop3Stat = currentPop3Stat; | 55 | lastPop3Stat = currentPop3Stat; |
56 | } | 56 | } |
57 | 57 | ||
58 | void StatusMail::check_current_stat(folderStat&targetStat) | 58 | void StatusMail::check_current_stat(folderStat&targetStat) |
@@ -63,28 +63,28 @@ void StatusMail::check_current_stat(folderStat&targetStat) | |||
63 | currentPop3Stat.message_count = 0; | 63 | currentPop3Stat.message_count = 0; |
64 | currentPop3Stat.message_unseen = 0; | 64 | currentPop3Stat.message_unseen = 0; |
65 | currentImapStat = currentPop3Stat; | 65 | currentImapStat = currentPop3Stat; |
66 | for ( it = connectionList.first(); it; it = connectionList.next() ) { | 66 | for ( it = connectionList.first(); it; it = connectionList.next() ) { |
67 | it->statusFolder(currentStat); | 67 | it->statusFolder(currentStat); |
68 | it->logout(); | 68 | it->logout(); |
69 | if (it->getType() == MAILLIB::A_IMAP) { | 69 | if (it->getType() == MAILLIB::A_IMAP) { |
70 | currentImapStat.message_unseen+=currentStat.message_unseen; | 70 | currentImapStat.message_unseen+=currentStat.message_unseen; |
71 | currentImapStat.message_recent+=currentStat.message_recent; | 71 | currentImapStat.message_recent+=currentStat.message_recent; |
72 | currentImapStat.message_count+=currentStat.message_count; | 72 | currentImapStat.message_count+=currentStat.message_count; |
73 | } else if (it->getType() == MAILLIB::A_POP3) { | 73 | } else if (it->getType() == MAILLIB::A_POP3) { |
74 | currentPop3Stat.message_count+=currentStat.message_count; | 74 | currentPop3Stat.message_count+=currentStat.message_count; |
75 | qDebug("Pop3 count: %i",currentPop3Stat.message_count); | 75 | odebug << "Pop3 count: " << currentPop3Stat.message_count << "" << oendl; |
76 | } | 76 | } |
77 | } | 77 | } |
78 | qDebug("Pop3 last: %i",lastPop3Stat.message_count); | 78 | odebug << "Pop3 last: " << lastPop3Stat.message_count << "" << oendl; |
79 | if (currentPop3Stat.message_count > lastPop3Stat.message_count) { | 79 | if (currentPop3Stat.message_count > lastPop3Stat.message_count) { |
80 | currentPop3Stat.message_recent = currentPop3Stat.message_count - lastPop3Stat.message_count; | 80 | currentPop3Stat.message_recent = currentPop3Stat.message_count - lastPop3Stat.message_count; |
81 | currentPop3Stat.message_unseen = currentPop3Stat.message_recent; | 81 | currentPop3Stat.message_unseen = currentPop3Stat.message_recent; |
82 | } else { | 82 | } else { |
83 | lastPop3Stat.message_count = currentPop3Stat.message_count; | 83 | lastPop3Stat.message_count = currentPop3Stat.message_count; |
84 | currentPop3Stat.message_recent = currentPop3Stat.message_unseen = 0; | 84 | currentPop3Stat.message_recent = currentPop3Stat.message_unseen = 0; |
85 | } | 85 | } |
86 | targetStat = currentImapStat; | 86 | targetStat = currentImapStat; |
87 | targetStat.message_unseen+=currentPop3Stat.message_unseen; | 87 | targetStat.message_unseen+=currentPop3Stat.message_unseen; |
88 | targetStat.message_recent+=currentPop3Stat.message_recent; | 88 | targetStat.message_recent+=currentPop3Stat.message_recent; |
89 | targetStat.message_count+=currentPop3Stat.message_count; | 89 | targetStat.message_count+=currentPop3Stat.message_count; |
90 | } | 90 | } |
diff --git a/noncore/net/mail/libmailwrapper/storemail.cpp b/noncore/net/mail/libmailwrapper/storemail.cpp index 914a11d..546d756 100644 --- a/noncore/net/mail/libmailwrapper/storemail.cpp +++ b/noncore/net/mail/libmailwrapper/storemail.cpp | |||
@@ -49,40 +49,40 @@ Storemail::Storemail(const QString&aFolder) | |||
49 | Storemail::~Storemail() | 49 | Storemail::~Storemail() |
50 | { | 50 | { |
51 | } | 51 | } |
52 | 52 | ||
53 | int Storemail::storeMail(const Opie::Core::OSmartPointer<Mail>&mail) | 53 | int Storemail::storeMail(const Opie::Core::OSmartPointer<Mail>&mail) |
54 | { | 54 | { |
55 | if (!wrapper) return 0; | 55 | if (!wrapper) return 0; |
56 | int ret = 1; | 56 | int ret = 1; |
57 | 57 | ||
58 | mailmime * mimeMail = 0; | 58 | mailmime * mimeMail = 0; |
59 | mimeMail = createMimeMail(mail ); | 59 | mimeMail = createMimeMail(mail ); |
60 | if ( mimeMail == NULL ) { | 60 | if ( mimeMail == NULL ) { |
61 | qDebug( "storeMail: error creating mime mail" ); | 61 | odebug << "storeMail: error creating mime mail" << oendl; |
62 | return 0; | 62 | return 0; |
63 | } | 63 | } |
64 | char *data; | 64 | char *data; |
65 | size_t size; | 65 | size_t size; |
66 | data = 0; | 66 | data = 0; |
67 | 67 | ||
68 | mailmessage * msg = 0; | 68 | mailmessage * msg = 0; |
69 | msg = mime_message_init(mimeMail); | 69 | msg = mime_message_init(mimeMail); |
70 | mime_message_set_tmpdir(msg,getenv( "HOME" )); | 70 | mime_message_set_tmpdir(msg,getenv( "HOME" )); |
71 | int r = mailmessage_fetch(msg,&data,&size); | 71 | int r = mailmessage_fetch(msg,&data,&size); |
72 | mime_message_detach_mime(msg); | 72 | mime_message_detach_mime(msg); |
73 | mailmessage_free(msg); | 73 | mailmessage_free(msg); |
74 | msg = 0; | 74 | msg = 0; |
75 | if (r != MAIL_NO_ERROR || !data) { | 75 | if (r != MAIL_NO_ERROR || !data) { |
76 | qDebug("Error fetching mime..."); | 76 | odebug << "Error fetching mime..." << oendl; |
77 | ret = 0; | 77 | ret = 0; |
78 | } | 78 | } |
79 | 79 | ||
80 | if (ret) { | 80 | if (ret) { |
81 | wrapper->storeMessage(data,size,m_tfolder); | 81 | wrapper->storeMessage(data,size,m_tfolder); |
82 | } | 82 | } |
83 | 83 | ||
84 | if (data) { | 84 | if (data) { |
85 | free(data); | 85 | free(data); |
86 | } | 86 | } |
87 | if (mimeMail) { | 87 | if (mimeMail) { |
88 | mailmime_free( mimeMail ); | 88 | mailmime_free( mimeMail ); |