author | alwin <alwin> | 2004-03-19 01:04:35 (UTC) |
---|---|---|
committer | alwin <alwin> | 2004-03-19 01:04:35 (UTC) |
commit | 2c8db13612d37c941676b4033298afc8e757765d (patch) (unidiff) | |
tree | a1c2fa0817b00999f4b8f916978f78064c4355e1 /noncore | |
parent | 06a659114c19890a1875f22c62a96bdb908fd25f (diff) | |
download | opie-2c8db13612d37c941676b4033298afc8e757765d.zip opie-2c8db13612d37c941676b4033298afc8e757765d.tar.gz opie-2c8db13612d37c941676b4033298afc8e757765d.tar.bz2 |
set callbacks for pop3 and nntp but seems never be called
in imap qApp-processEvents() is called for avoiding gui blocking
-rw-r--r-- | noncore/net/mail/libmailwrapper/imapwrapper.cpp | 2 | ||||
-rw-r--r-- | noncore/net/mail/libmailwrapper/nntpwrapper.cpp | 4 | ||||
-rw-r--r-- | noncore/net/mail/libmailwrapper/pop3wrapper.cpp | 6 |
3 files changed, 12 insertions, 0 deletions
diff --git a/noncore/net/mail/libmailwrapper/imapwrapper.cpp b/noncore/net/mail/libmailwrapper/imapwrapper.cpp index 230cf53..657c2ba 100644 --- a/noncore/net/mail/libmailwrapper/imapwrapper.cpp +++ b/noncore/net/mail/libmailwrapper/imapwrapper.cpp | |||
@@ -1,15 +1,16 @@ | |||
1 | #include <stdlib.h> | 1 | #include <stdlib.h> |
2 | #include <libetpan/libetpan.h> | 2 | #include <libetpan/libetpan.h> |
3 | #include <qpe/global.h> | 3 | #include <qpe/global.h> |
4 | #include <opie2/oapplication.h> | ||
4 | 5 | ||
5 | #include "imapwrapper.h" | 6 | #include "imapwrapper.h" |
6 | #include "mailtypes.h" | 7 | #include "mailtypes.h" |
7 | #include "logindialog.h" | 8 | #include "logindialog.h" |
8 | 9 | ||
9 | using namespace Opie::Core; | 10 | using namespace Opie::Core; |
10 | IMAPwrapper::IMAPwrapper( IMAPaccount *a ) | 11 | IMAPwrapper::IMAPwrapper( IMAPaccount *a ) |
11 | : AbstractMail() | 12 | : AbstractMail() |
12 | { | 13 | { |
13 | account = a; | 14 | account = a; |
14 | m_imap = 0; | 15 | m_imap = 0; |
15 | m_Lastmbox = ""; | 16 | m_Lastmbox = ""; |
@@ -30,24 +31,25 @@ int IMAPwrapper::selectMbox(const QString&mbox) | |||
30 | int err = mailimap_select( m_imap, (char*)mbox.latin1()); | 31 | int err = mailimap_select( m_imap, (char*)mbox.latin1()); |
31 | if ( err != MAILIMAP_NO_ERROR ) { | 32 | if ( err != MAILIMAP_NO_ERROR ) { |
32 | qDebug("error selecting mailbox: %s",m_imap->imap_response); | 33 | qDebug("error selecting mailbox: %s",m_imap->imap_response); |
33 | m_Lastmbox = ""; | 34 | m_Lastmbox = ""; |
34 | return err; | 35 | return err; |
35 | } | 36 | } |
36 | m_Lastmbox = mbox; | 37 | m_Lastmbox = mbox; |
37 | return err; | 38 | return err; |
38 | } | 39 | } |
39 | 40 | ||
40 | void IMAPwrapper::imap_progress( size_t current, size_t maximum ) | 41 | void IMAPwrapper::imap_progress( size_t current, size_t maximum ) |
41 | { | 42 | { |
43 | qApp->processEvents(); | ||
42 | qDebug( "IMAP: %i of %i", current, maximum ); | 44 | qDebug( "IMAP: %i of %i", current, maximum ); |
43 | } | 45 | } |
44 | 46 | ||
45 | bool IMAPwrapper::start_tls(bool force_tls) | 47 | bool IMAPwrapper::start_tls(bool force_tls) |
46 | { | 48 | { |
47 | int err; | 49 | int err; |
48 | bool try_tls; | 50 | bool try_tls; |
49 | mailimap_capability_data * cap_data = 0; | 51 | mailimap_capability_data * cap_data = 0; |
50 | 52 | ||
51 | err = mailimap_capability(m_imap,&cap_data); | 53 | err = mailimap_capability(m_imap,&cap_data); |
52 | if (err != MAILIMAP_NO_ERROR) { | 54 | if (err != MAILIMAP_NO_ERROR) { |
53 | Global::statusMessage("error getting capabilities!"); | 55 | Global::statusMessage("error getting capabilities!"); |
diff --git a/noncore/net/mail/libmailwrapper/nntpwrapper.cpp b/noncore/net/mail/libmailwrapper/nntpwrapper.cpp index cc36f32..cfded43 100644 --- a/noncore/net/mail/libmailwrapper/nntpwrapper.cpp +++ b/noncore/net/mail/libmailwrapper/nntpwrapper.cpp | |||
@@ -167,24 +167,28 @@ void NNTPwrapper::login() | |||
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 | qDebug( QString( "FEHLERNUMMER %1" ).arg( err ) ); |
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 { | ||
180 | mailsession * session = m_nntp->sto_session; | ||
181 | newsnntp * news = ( ( nntp_session_state_data * )session->sess_data )->nntp_session; | ||
182 | news->nntp_progr_fun = &nntp_progress; | ||
179 | } | 183 | } |
180 | 184 | ||
181 | } | 185 | } |
182 | 186 | ||
183 | void NNTPwrapper::logout() | 187 | void NNTPwrapper::logout() |
184 | { | 188 | { |
185 | int err = NEWSNNTP_NO_ERROR; | 189 | int err = NEWSNNTP_NO_ERROR; |
186 | if ( m_nntp == NULL ) | 190 | if ( m_nntp == NULL ) |
187 | return; | 191 | return; |
188 | mailstorage_free(m_nntp); | 192 | mailstorage_free(m_nntp); |
189 | m_nntp = 0; | 193 | m_nntp = 0; |
190 | } | 194 | } |
diff --git a/noncore/net/mail/libmailwrapper/pop3wrapper.cpp b/noncore/net/mail/libmailwrapper/pop3wrapper.cpp index 1b7a1b4..5467547 100644 --- a/noncore/net/mail/libmailwrapper/pop3wrapper.cpp +++ b/noncore/net/mail/libmailwrapper/pop3wrapper.cpp | |||
@@ -157,24 +157,30 @@ void POP3wrapper::login() | |||
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 | qDebug( QString( "FEHLERNUMMER %1" ).arg( err ) ); |
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 { | ||
170 | mailsession * session = m_pop3->sto_session; | ||
171 | mailpop3 * mail = ( ( pop3_session_state_data * )session->sess_data )->pop3_session; | ||
172 | if (mail) { | ||
173 | mail->pop3_progr_fun = &pop3_progress; | ||
174 | } | ||
169 | } | 175 | } |
170 | } | 176 | } |
171 | 177 | ||
172 | void POP3wrapper::logout() | 178 | void POP3wrapper::logout() |
173 | { | 179 | { |
174 | if ( m_pop3 == NULL ) | 180 | if ( m_pop3 == NULL ) |
175 | return; | 181 | return; |
176 | mailstorage_free(m_pop3); | 182 | mailstorage_free(m_pop3); |
177 | m_pop3 = 0; | 183 | m_pop3 = 0; |
178 | } | 184 | } |
179 | 185 | ||
180 | 186 | ||