author | jgf <jgf> | 2003-12-18 16:02:47 (UTC) |
---|---|---|
committer | jgf <jgf> | 2003-12-18 16:02:47 (UTC) |
commit | 5b88f5d05b2f3f5d106b58b07bc7018f757cfc03 (patch) (side-by-side diff) | |
tree | 27f8a7ccb9dd659ea8484cb12c0e3dc3c3c99252 /noncore/net/mail/libmailwrapper | |
parent | 5cb08b0c69ffc7216405b552e17ff0541578bda0 (diff) | |
download | opie-5b88f5d05b2f3f5d106b58b07bc7018f757cfc03.zip opie-5b88f5d05b2f3f5d106b58b07bc7018f757cfc03.tar.gz opie-5b88f5d05b2f3f5d106b58b07bc7018f757cfc03.tar.bz2 |
ask for user/password if field is empty
Diffstat (limited to 'noncore/net/mail/libmailwrapper') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/net/mail/libmailwrapper/imapwrapper.cpp | 19 | ||||
-rw-r--r-- | noncore/net/mail/libmailwrapper/pop3wrapper.cpp | 20 |
2 files changed, 35 insertions, 4 deletions
diff --git a/noncore/net/mail/libmailwrapper/imapwrapper.cpp b/noncore/net/mail/libmailwrapper/imapwrapper.cpp index 838300a..cce3d34 100644 --- a/noncore/net/mail/libmailwrapper/imapwrapper.cpp +++ b/noncore/net/mail/libmailwrapper/imapwrapper.cpp @@ -4,4 +4,5 @@ #include "imapwrapper.h" #include "mailtypes.h" +#include "logindialog.h" #include <libetpan/mailimap.h> @@ -37,6 +38,20 @@ void IMAPwrapper::login() server = account->getServer().latin1(); port = account->getPort().toUInt(); - user = account->getUser().latin1(); - pass = account->getPassword().latin1(); + if ( account->getUser().isEmpty() || account->getPassword().isEmpty() ) { + LoginDialog login( account->getUser(), account->getPassword(), NULL, 0, true ); + login.show(); + if ( QDialog::Accepted == login.exec() ) { + // ok + user = strdup( login.getUser().latin1() ); + pass = strdup( login.getPassword().latin1() ); + } else { + // cancel + qDebug( "IMAP: Login canceled" ); + return; + } + } else { + user = account->getUser().latin1(); + pass = account->getPassword().latin1(); + } m_imap = mailimap_new( 20, &imap_progress ); diff --git a/noncore/net/mail/libmailwrapper/pop3wrapper.cpp b/noncore/net/mail/libmailwrapper/pop3wrapper.cpp index 22a4c70..b0b985c 100644 --- a/noncore/net/mail/libmailwrapper/pop3wrapper.cpp +++ b/noncore/net/mail/libmailwrapper/pop3wrapper.cpp @@ -2,4 +2,5 @@ #include "pop3wrapper.h" #include "mailtypes.h" +#include "logindialog.h" #include <libetpan/mailpop3.h> #include <libetpan/mailmime.h> @@ -358,6 +359,21 @@ void POP3wrapper::login() server = account->getServer().latin1(); port = account->getPort().toUInt(); - user = account->getUser().latin1(); - pass = account->getPassword().latin1(); + + if ( account->getUser().isEmpty() || account->getPassword().isEmpty() ) { + LoginDialog login( account->getUser(), account->getPassword(), NULL, 0, true ); + login.show(); + if ( QDialog::Accepted == login.exec() ) { + // ok + user = strdup( login.getUser().latin1() ); + pass = strdup( login.getPassword().latin1() ); + } else { + // cancel + qDebug( "POP3: Login canceled" ); + return; + } + } else { + user = account->getUser().latin1(); + pass = account->getPassword().latin1(); + } m_pop3 = mailpop3_new( 200, &pop3_progress ); |