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
@@ -6,3 +6,13 @@
 #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"
+
 
@@ -64,3 +74,3 @@ void Settings::updateAccounts()
     }
-    
+
     QStringList nntp = dir.entryList( "nntp-*" );
@@ -71,3 +81,3 @@ void Settings::updateAccounts()
     }
-    
+
     readAccounts();
@@ -77,3 +87,3 @@ void Settings::saveAccounts()
 {
-    checkDirectory(); 
+    checkDirectory();
     Account *it;
@@ -87,3 +97,3 @@ void Settings::readAccounts()
 {
-    checkDirectory(); 
+    checkDirectory();
     Account *it;
@@ -132,3 +142,3 @@ QString IMAPaccount::getUniqueFileName()
     QString unique;
-    
+
     QDir dir( (QString) getenv( "HOME" ) + "/Applications/opiemail" );
@@ -166,3 +176,3 @@ void IMAPaccount::save()
     Settings::checkDirectory();
-    
+
     Config *conf = new Config( getFileName(), Config::File );
@@ -209,3 +219,3 @@ QString POP3account::getUniqueFileName()
     QString unique;
-    
+
     QDir dir( (QString) getenv( "HOME" ) + "/Applications/opiemail" );
@@ -236,3 +246,3 @@ void POP3account::save()
     Settings::checkDirectory();
-    
+
     Config *conf = new Config( getFileName(), Config::File );
@@ -283,3 +293,3 @@ QString SMTPaccount::getUniqueFileName()
     QString unique;
-    
+
     QDir dir( (QString) getenv( "HOME" ) + "/Applications/opiemail" );
@@ -311,3 +321,3 @@ void SMTPaccount::save()
     Settings::checkDirectory();
-    
+
     Config *conf = new Config( getFileName(), Config::File );
@@ -356,3 +366,3 @@ QString NNTPaccount::getUniqueFileName()
     QString unique;
-    
+
     QDir dir( (QString) getenv( "HOME" ) + "/Applications/opiemail" );
@@ -384,3 +394,3 @@ void NNTPaccount::save()
     Settings::checkDirectory();
-    
+
     Config *conf = new Config( getFileName(), Config::File );