ask for user/password if field is empty

author: jgf <jgf> 2003-12-18 16:02:47 (UTC)
committer: jgf <jgf> 2003-12-18 16:02:47 (UTC)
commit: 5b88f5d05b2f3f5d106b58b07bc7018f757cfc03 (patch) (unidiff)
tree: 27f8a7ccb9dd659ea8484cb12c0e3dc3c3c99252
parent: 5cb08b0c69ffc7216405b552e17ff0541578bda0 (diff)
download: opie-5b88f5d05b2f3f5d106b58b07bc7018f757cfc03.zip
opie-5b88f5d05b2f3f5d106b58b07bc7018f757cfc03.tar.gz
opie-5b88f5d05b2f3f5d106b58b07bc7018f757cfc03.tar.bz2
4 files changed, 62 insertions, 0 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();
+        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();
+        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();
+        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();
+        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();
+        }
author	jgf <jgf>	2003-12-18 16:02:47 (UTC)
committer	jgf <jgf>	2003-12-18 16:02:47 (UTC)
commit	5b88f5d05b2f3f5d106b58b07bc7018f757cfc03 (patch) (unidiff)
tree	27f8a7ccb9dd659ea8484cb12c0e3dc3c3c99252
parent	5cb08b0c69ffc7216405b552e17ff0541578bda0 (diff)
download	opie-5b88f5d05b2f3f5d106b58b07bc7018f757cfc03.zip opie-5b88f5d05b2f3f5d106b58b07bc7018f757cfc03.tar.gz opie-5b88f5d05b2f3f5d106b58b07bc7018f757cfc03.tar.bz2

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 @@
5	#include "mailtypes.h"	5	#include "mailtypes.h"
		6	#include "logindialog.h"
6	#include <libetpan/mailimap.h>	7	#include <libetpan/mailimap.h>
@@ -38,4 +39,18 @@ void IMAPwrapper::login()
38	port = account->getPort().toUInt();	39	port = account->getPort().toUInt();
		40	if ( account->getUser().isEmpty() \|\| account->getPassword().isEmpty() ) {
		41	LoginDialog login( account->getUser(), account->getPassword(), NULL, 0, true );
		42	login.show();
		43	if ( QDialog::Accepted == login.exec() ) {
		44	// ok
		45	user = strdup( login.getUser().latin1() );
		46	pass = strdup( login.getPassword().latin1() );
		47	} else {
		48	// cancel
		49	qDebug( "IMAP: Login canceled" );
		50	return;
		51	}
		52	} else {
39	user = account->getUser().latin1();	53	user = account->getUser().latin1();
40	pass = account->getPassword().latin1();	54	pass = account->getPassword().latin1();
		55	}
41		56


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 @@
5	#include "mailtypes.h"	5	#include "mailtypes.h"
		6	#include "logindialog.h"
6	#include <libetpan/mailimap.h>	7	#include <libetpan/mailimap.h>
@@ -38,4 +39,18 @@ void IMAPwrapper::login()
38	port = account->getPort().toUInt();	39	port = account->getPort().toUInt();
		40	if ( account->getUser().isEmpty() \|\| account->getPassword().isEmpty() ) {
		41	LoginDialog login( account->getUser(), account->getPassword(), NULL, 0, true );
		42	login.show();
		43	if ( QDialog::Accepted == login.exec() ) {
		44	// ok
		45	user = strdup( login.getUser().latin1() );
		46	pass = strdup( login.getPassword().latin1() );
		47	} else {
		48	// cancel
		49	qDebug( "IMAP: Login canceled" );
		50	return;
		51	}
		52	} else {
39	user = account->getUser().latin1();	53	user = account->getUser().latin1();
40	pass = account->getPassword().latin1();	54	pass = account->getPassword().latin1();
		55	}
41		56


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 @@
3	#include "mailtypes.h"	3	#include "mailtypes.h"
		4	#include "logindialog.h"
4	#include <libetpan/mailpop3.h>	5	#include <libetpan/mailpop3.h>
@@ -359,4 +360,19 @@ void POP3wrapper::login()
359	port = account->getPort().toUInt();	360	port = account->getPort().toUInt();
		361
		362	if ( account->getUser().isEmpty() \|\| account->getPassword().isEmpty() ) {
		363	LoginDialog login( account->getUser(), account->getPassword(), NULL, 0, true );
		364	login.show();
		365	if ( QDialog::Accepted == login.exec() ) {
		366	// ok
		367	user = strdup( login.getUser().latin1() );
		368	pass = strdup( login.getPassword().latin1() );
		369	} else {
		370	// cancel
		371	qDebug( "POP3: Login canceled" );
		372	return;
		373	}
		374	} else {
360	user = account->getUser().latin1();	375	user = account->getUser().latin1();
361	pass = account->getPassword().latin1();	376	pass = account->getPassword().latin1();
		377	}
362		378


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 @@
3	#include "mailtypes.h"	3	#include "mailtypes.h"
		4	#include "logindialog.h"
4	#include <libetpan/mailpop3.h>	5	#include <libetpan/mailpop3.h>
@@ -359,4 +360,19 @@ void POP3wrapper::login()
359	port = account->getPort().toUInt();	360	port = account->getPort().toUInt();
		361
		362	if ( account->getUser().isEmpty() \|\| account->getPassword().isEmpty() ) {
		363	LoginDialog login( account->getUser(), account->getPassword(), NULL, 0, true );
		364	login.show();
		365	if ( QDialog::Accepted == login.exec() ) {
		366	// ok
		367	user = strdup( login.getUser().latin1() );
		368	pass = strdup( login.getPassword().latin1() );
		369	} else {
		370	// cancel
		371	qDebug( "POP3: Login canceled" );
		372	return;
		373	}
		374	} else {
360	user = account->getUser().latin1();	375	user = account->getUser().latin1();
361	pass = account->getPassword().latin1();	376	pass = account->getPassword().latin1();
		377	}
362		378