1 files changed, 23 insertions, 13 deletions

diff --git a/noncore/net/mail/libmailwrapper/settings.cpp b/noncore/net/mail/libmailwrapper/settings.cpp
index 17aa1b0..c5187f5 100644
--- a/noncore/net/mail/libmailwrapper/settings.cpp
+++ b/noncore/net/mail/libmailwrapper/settings.cpp
@@ -1,15 +1,25 @@
 #include <stdlib.h>
 #include <qdir.h>
 
 #include <qpe/config.h>
 
 #include "settings.h"
-#include "defines.h"
+//#include "defines.h"
+
+#define IMAP_PORT           "143"
+#define IMAP_SSL_PORT       "993"
+#define SMTP_PORT           "25"
+#define SMTP_SSL_PORT       "465"
+#define POP3_PORT           "110"
+#define POP3_SSL_PORT       "995"
+#define NNTP_PORT           "119"
+#define NNTP_SSL_PORT       "563"
+
 
 Settings::Settings()
     : QObject()
 {
    updateAccounts();
 }
 
 void Settings::checkDirectory()
@@ -57,40 +67,40 @@ void Settings::updateAccounts()
     }
 
     QStringList smtp = dir.entryList( "smtp-*" );
     for ( it = smtp.begin(); it != smtp.end(); it++ ) {
         qDebug( "Added SMTP account" );
         SMTPaccount *account = new SMTPaccount( (*it).replace(0, 5, "") );
         accounts.append( account );
     }
-    
+
     QStringList nntp = dir.entryList( "nntp-*" );
     for ( it = nntp.begin(); it != nntp.end(); it++ ) {
         qDebug( "Added NNTP account" );
         NNTPaccount *account = new NNTPaccount( (*it).replace(0, 5, "") );
         accounts.append( account );
     }
-    
+
     readAccounts();
 }
 
 void Settings::saveAccounts()
 {
-    checkDirectory(); 
+    checkDirectory();
     Account *it;
 
     for ( it = accounts.first(); it; it = accounts.next() ) {
         it->save();
     }
 }
 
 void Settings::readAccounts()
 {
-    checkDirectory(); 
+    checkDirectory();
     Account *it;
 
     for ( it = accounts.first(); it; it = accounts.next() ) {
         it->read();
     }
 }
 
 Account::Account()
@@ -125,17 +135,17 @@ IMAPaccount::IMAPaccount( QString filename )
     type = "IMAP";
     port = IMAP_PORT;
 }
 
 QString IMAPaccount::getUniqueFileName()
 {
     int num = 0;
     QString unique;
-    
+
     QDir dir( (QString) getenv( "HOME" ) + "/Applications/opiemail" );
 
     QStringList imap = dir.entryList( "imap-*" );
     do {
         unique.setNum( num++ );
     } while ( imap.contains( "imap-" + unique ) > 0 );
 
     return unique;
@@ -159,17 +169,17 @@ void IMAPaccount::read()
     prefix = conf->readEntry("MailPrefix","");
     if (prefix.isNull()) prefix = "";
 }
 
 void IMAPaccount::save()
 {
     qDebug( "saving " + getFileName() );
     Settings::checkDirectory();
-    
+
     Config *conf = new Config( getFileName(), Config::File );
     conf->setGroup( "IMAP Account" );
     conf->writeEntry( "Account", accountName );
     conf->writeEntry( "Server", server );
     conf->writeEntry( "Port", port );
     conf->writeEntry( "SSL", ssl );
     conf->writeEntry( "User", user );
     conf->writeEntryCrypt( "Password", password );
@@ -202,17 +212,17 @@ POP3account::POP3account( QString filename )
     type = "POP3";
     port = POP3_PORT;
 }
 
 QString POP3account::getUniqueFileName()
 {
     int num = 0;
     QString unique;
-    
+
     QDir dir( (QString) getenv( "HOME" ) + "/Applications/opiemail" );
 
     QStringList imap = dir.entryList( "pop3-*" );
     do {
         unique.setNum( num++ );
     } while ( imap.contains( "pop3-" + unique ) > 0 );
 
     return unique;
@@ -229,17 +239,17 @@ void POP3account::read()
     user = conf->readEntry( "User" );
     password = conf->readEntryCrypt( "Password" );
 }
 
 void POP3account::save()
 {
     qDebug( "saving " + getFileName() );
     Settings::checkDirectory();
-    
+
     Config *conf = new Config( getFileName(), Config::File );
     conf->setGroup( "POP3 Account" );
     conf->writeEntry( "Account", accountName );
     conf->writeEntry( "Server", server );
     conf->writeEntry( "Port", port );
     conf->writeEntry( "SSL", ssl );
     conf->writeEntry( "User", user );
     conf->writeEntryCrypt( "Password", password );
@@ -276,17 +286,17 @@ SMTPaccount::SMTPaccount( QString filename )
     type = "SMTP";
     port = SMTP_PORT;
 }
 
 QString SMTPaccount::getUniqueFileName()
 {
     int num = 0;
     QString unique;
-    
+
     QDir dir( (QString) getenv( "HOME" ) + "/Applications/opiemail" );
 
     QStringList imap = dir.entryList( "smtp-*" );
     do {
         unique.setNum( num++ );
     } while ( imap.contains( "smtp-" + unique ) > 0 );
 
     return unique;
@@ -304,17 +314,17 @@ void SMTPaccount::read()
     user = conf->readEntry( "User" );
     password = conf->readEntryCrypt( "Password" );
 }
 
 void SMTPaccount::save()
 {
     qDebug( "saving " + getFileName() );
     Settings::checkDirectory();
-    
+
     Config *conf = new Config( getFileName(), Config::File );
     conf->setGroup( "SMTP Account" );
     conf->writeEntry( "Account", accountName );
     conf->writeEntry( "Server", server );
     conf->writeEntry( "Port", port );
     conf->writeEntry( "SSL", ssl );
     conf->writeEntry( "Login", login );
     conf->writeEntry( "User", user );
@@ -349,17 +359,17 @@ NNTPaccount::NNTPaccount( QString filename )
     type = "NNTP";
     port = NNTP_PORT;
 }
 
 QString NNTPaccount::getUniqueFileName()
 {
     int num = 0;
     QString unique;
-    
+
     QDir dir( (QString) getenv( "HOME" ) + "/Applications/opiemail" );
 
     QStringList imap = dir.entryList( "nntp-*" );
     do {
         unique.setNum( num++ );
     } while ( imap.contains( "nntp-" + unique ) > 0 );
 
     return unique;
@@ -377,17 +387,17 @@ void NNTPaccount::read()
     user = conf->readEntry( "User" );
     password = conf->readEntryCrypt( "Password" );
 }
 
 void NNTPaccount::save()
 {
     qDebug( "saving " + getFileName() );
     Settings::checkDirectory();
-    
+
     Config *conf = new Config( getFileName(), Config::File );
     conf->setGroup( "NNTP Account" );
     conf->writeEntry( "Account", accountName );
     conf->writeEntry( "Server", server );
     conf->writeEntry( "Port", port );
     conf->writeEntry( "SSL", ssl );
     conf->writeEntry( "Login", login );
     conf->writeEntry( "User", user );