1 files changed, 3 insertions, 9 deletions

diff --git a/kmicromail/koprefs.cpp b/kmicromail/koprefs.cpp
index c0200ff..8143b6f 100644
--- a/kmicromail/koprefs.cpp
+++ b/kmicromail/koprefs.cpp
@@ -6,123 +6,117 @@
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
     As a special exception, permission is given to link this program
     with any edition of Qt, and distribute the resulting executable,
     without including the source code for Qt in the source distribution.
 */
 
 #include <time.h>
 #ifndef _WIN32_
 #include <unistd.h>
 #endif
 #include <qdir.h>
 #include <qtextstream.h>
 #include <qtextcodec.h>
 #include <qstring.h>
 #include <qregexp.h>
 #include <qfont.h>
 #include <qcolor.h>
 #include <qstringlist.h>
 #include <stdlib.h>
 
 #include <kglobal.h>
 #include <kconfig.h>
 #include <klocale.h>
 #include <kdebug.h>
 #include <kemailsettings.h>
 #include <kstaticdeleter.h>
 
 #include "koprefs.h"
 #include "mainwindow.h"
 
 
 KOPrefs *KOPrefs::mInstance = 0;
 static KStaticDeleter<KOPrefs> insd;
 
 KOPrefs::KOPrefs() :
   KPimPrefs("kopiemailrc")
 {
     mAppFont = QFont("helvetica",12);
     mComposeFont = QFont("helvetica",12);
     mReadFont = QFont("helvetica",12);
 
     KPrefs::setCurrentGroup("General");
     addItemString("SenderName",&mName,i18n ("Please set at") );
     addItemString("SenderEmail",&mEmail,i18n ("Settings@General TAB") );
     addItemBool("ViewMailAsHtml",&mViewAsHtml,false);
     addItemBool("SendMailLater",&mSendLater,true);
     addItemBool("UseKapi",&mUseKapi,false);
     
     KPrefs::setCurrentGroup("Fonts");
     addItemFont("Application Font",&mAppFont);
     addItemFont("Compose Font",&mComposeFont);
     addItemFont("Read Font",&mReadFont);
-
+    fillMailDefaults();
 
 }
 
 
 KOPrefs::~KOPrefs()
 {
   if (mInstance == this)
       mInstance = insd.setObject(0); 
 
 }
 
 
 KOPrefs *KOPrefs::instance()
 {
   if (!mInstance) {
       mInstance = insd.setObject(new KOPrefs());
       mInstance->readConfig();
   }
 
   return mInstance;
 }
 
 void KOPrefs::usrSetDefaults()
 {
    
 }
 
 void KOPrefs::fillMailDefaults()
 {
-  if (mName.isEmpty()) mName = i18n("Anonymous");
-  if (mEmail.isEmpty()) mEmail = i18n("nobody@nowhere");
+  if (mName.isEmpty()) mName = i18n ("Please set at");
+  if (mEmail.isEmpty()) mEmail = i18n ("Settings@General TAB");
 }
 
-void KOPrefs::setTimeZoneIdDefault()
-{
-  mTimeZoneId = i18n("+01:00 Europe/Oslo(CET)");
-}
-
-
 void KOPrefs::usrReadConfig()
 {
 
   KPimPrefs::usrReadConfig();
 }
 
 
 void KOPrefs::usrWriteConfig()
 {
 
   KPimPrefs::usrWriteConfig();
 }
 
 
 
 KConfig* KOPrefs::getConfig()
 {
     return config();
 }