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
@@ -5,2 +5,3 @@
 #include "mailtypes.h"
+#include "logindialog.h"
 #include <libetpan/mailimap.h>
@@ -38,4 +39,18 @@ void IMAPwrapper::login()
     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();
+	}
 
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
@@ -5,2 +5,3 @@
 #include "mailtypes.h"
+#include "logindialog.h"
 #include <libetpan/mailimap.h>
@@ -38,4 +39,18 @@ void IMAPwrapper::login()
     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();
+	}
 
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
@@ -3,2 +3,3 @@
 #include "mailtypes.h"
+#include "logindialog.h"
 #include <libetpan/mailpop3.h>
@@ -359,4 +360,19 @@ void POP3wrapper::login()
     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();
+	}
 
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
@@ -3,2 +3,3 @@
 #include "mailtypes.h"
+#include "logindialog.h"
 #include <libetpan/mailpop3.h>
@@ -359,4 +360,19 @@ void POP3wrapper::login()
     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();
+	}