reduced to the max...

- from address isn't setup any longer within the smtp account (it makes realy no
  sense, a smtp account describes the connection to a smtp server, not the
  identity of the sender)
- from address is taken from the personal info of the addressbook (thats why this
  info exists). Of course the user can change it when sending an email.
- user can select a from with a selection of the mails given in their personal
  infos.
- in addresspicker: use "<Firstname> <Lastname>" instead of "Filename"
- settings ui: switched of the part within the smtp accounts describing the
  identitiy of user
ToDo: a dialog setting up a default signature

1 files changed, 0 insertions, 25 deletions

diff --git a/noncore/net/mail/libmailwrapper/settings.cpp b/noncore/net/mail/libmailwrapper/settings.cpp
index b580954..17aa1b0 100644
--- a/noncore/net/mail/libmailwrapper/settings.cpp
+++ b/noncore/net/mail/libmailwrapper/settings.cpp
@@ -273,9 +273,6 @@ SMTPaccount::SMTPaccount( QString filename )
     accountName = "New SMTP Account";
     ssl = false;
     login = false;
-    useCC = false;
-    useBCC = false;
-    useReply = false;
     type = "SMTP";
     port = SMTP_PORT;
 }
@@ -306,17 +303,6 @@ void SMTPaccount::read()
     login = conf->readBoolEntry( "Login" );
     user = conf->readEntry( "User" );
     password = conf->readEntryCrypt( "Password" );
-    useCC = conf->readBoolEntry( "useCC" );
-    useBCC = conf->readBoolEntry( "useBCC" );
-    useReply = conf->readBoolEntry( "useReply" );
-    name = conf->readEntry( "Name" );
-    mail = conf->readEntry( "Mail" );
-    org = conf->readEntry( "Org" );
-    cc = conf->readEntry( "CC" );
-    bcc = conf->readEntry( "BCC" );
-    reply = conf->readEntry( "Reply" );
-    signature = conf->readEntry( "Signature" );
-    signature = signature.replace( QRegExp( "<br>" ), "\n" );
 }
 
 void SMTPaccount::save()
@@ -333,17 +319,6 @@ void SMTPaccount::save()
     conf->writeEntry( "Login", login );
     conf->writeEntry( "User", user );
     conf->writeEntryCrypt( "Password", password );
-    conf->writeEntry( "useCC", useCC );
-    conf->writeEntry( "useBCC", useBCC );
-    conf->writeEntry( "useReply", useReply );
-    conf->writeEntry( "Name", name );
-    conf->writeEntry( "Mail", mail );
-    conf->writeEntry( "Org", org );
-    conf->writeEntry( "CC", cc );
-    conf->writeEntry( "BCC", bcc );
-    conf->writeEntry( "Reply", reply );
-    conf->writeEntry( "Signature", 
-                      signature.replace( QRegExp( "\\n" ), "<br>" ) );
     conf->write();
 }