summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/net/mail/libmailwrapper/pop3wrapper.cpp11
-rw-r--r--noncore/net/mail/pop3wrapper.cpp11
2 files changed, 16 insertions, 6 deletions
diff --git a/noncore/net/mail/libmailwrapper/pop3wrapper.cpp b/noncore/net/mail/libmailwrapper/pop3wrapper.cpp
index 6decb6a..1538d50 100644
--- a/noncore/net/mail/libmailwrapper/pop3wrapper.cpp
+++ b/noncore/net/mail/libmailwrapper/pop3wrapper.cpp
@@ -24,9 +24,9 @@ void POP3wrapper::listMessages( QList<RecMail> &target )
int err = MAILPOP3_NO_ERROR;
char *header;
size_t length;
carray *messages;
-
+
login();
mailpop3_list( m_pop3, &messages );
for ( int i = carray_count( messages ); i > 0; i-- ) {
@@ -72,11 +72,16 @@ void POP3wrapper::login()
m_pop3 = mailpop3_new( 200, &pop3_progress );
// connect
- err = mailpop3_socket_connect( m_pop3, (char *) server, port );
+ if (account->getSSL()) {
+ err = mailpop3_ssl_connect( m_pop3, (char*)server, port );
+ } else {
+ err = mailpop3_socket_connect( m_pop3, (char*)server, port );
+ }
+
if ( err != MAILPOP3_NO_ERROR ) {
- qDebug( "pop3: error connecting to %s\n reason: %s", server,
+ qDebug( "pop3: error connecting to %s\n reason: %s", server,
m_pop3->response );
mailpop3_free( m_pop3 );
m_pop3 = NULL;
return;
diff --git a/noncore/net/mail/pop3wrapper.cpp b/noncore/net/mail/pop3wrapper.cpp
index 6decb6a..1538d50 100644
--- a/noncore/net/mail/pop3wrapper.cpp
+++ b/noncore/net/mail/pop3wrapper.cpp
@@ -24,9 +24,9 @@ void POP3wrapper::listMessages( QList<RecMail> &target )
int err = MAILPOP3_NO_ERROR;
char *header;
size_t length;
carray *messages;
-
+
login();
mailpop3_list( m_pop3, &messages );
for ( int i = carray_count( messages ); i > 0; i-- ) {
@@ -72,11 +72,16 @@ void POP3wrapper::login()
m_pop3 = mailpop3_new( 200, &pop3_progress );
// connect
- err = mailpop3_socket_connect( m_pop3, (char *) server, port );
+ if (account->getSSL()) {
+ err = mailpop3_ssl_connect( m_pop3, (char*)server, port );
+ } else {
+ err = mailpop3_socket_connect( m_pop3, (char*)server, port );
+ }
+
if ( err != MAILPOP3_NO_ERROR ) {
- qDebug( "pop3: error connecting to %s\n reason: %s", server,
+ qDebug( "pop3: error connecting to %s\n reason: %s", server,
m_pop3->response );
mailpop3_free( m_pop3 );
m_pop3 = NULL;
return;