4 files changed, 70 insertions, 8 deletions

diff --git a/noncore/net/mail/imapwrapper.cpp b/noncore/net/mail/imapwrapper.cpp
index 838300a..cce3d34 100644
--- a/noncore/net/mail/imapwrapper.cpp
+++ b/noncore/net/mail/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/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 );
diff --git a/noncore/net/mail/pop3wrapper.cpp b/noncore/net/mail/pop3wrapper.cpp
index 22a4c70..b0b985c 100644
--- a/noncore/net/mail/pop3wrapper.cpp
+++ b/noncore/net/mail/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 );