3 files changed, 15 insertions, 7 deletions

diff --git a/core/pim/today/TODO b/core/pim/today/TODO
index 6634cad..49503bd 100644
--- a/core/pim/today/TODO
+++ b/core/pim/today/TODO
@@ -1,5 +1,11 @@
 TODO for today: 
 
+- all icons clickable
+
+- retail rom mail plugin (z)
+
+- autostart on retail rom (Z)
+
 * show "upcoming appointents the next days 
 
 * show alarm icons on alarm events (partly done)
diff --git a/core/pim/today/todayconfig.cpp b/core/pim/today/todayconfig.cpp
index 9ff9ba6..3fc5830 100644
--- a/core/pim/today/todayconfig.cpp
+++ b/core/pim/today/todayconfig.cpp
@@ -104,12 +104,11 @@ TodayConfig::TodayConfig( QWidget* parent, const char* name, bool modal, WFlags
 void TodayConfig::setAutoStart() {
     Config cfg( "today" );
     cfg.setGroup( "Autostart" );
-    int autostart = cfg.readNumEntry( "autostart", 1 );
-    if ( autostart ) {
+    if ( m_autoStart ) {
         QCopEnvelope e( "QPE/System", "autoStart(QString,QString,QString)" );
         e << QString( "add" );
         e << QString( "today" );
-        e << m_autoStartTimer;
+        e << QString("%1").arg( m_autoStartTimer );
     } else {
         QCopEnvelope e( "QPE/System", "autoStart(QString,QString)" );
         e << QString( "remove" );
@@ -125,8 +124,8 @@ void TodayConfig::readConfig() {
     cfg.setGroup( "Autostart" );
     m_autoStart = cfg.readNumEntry( "autostart", 1 );
     CheckBoxAuto->setChecked( m_autoStart );
-    m_autoStartTimer = cfg.readEntry( "autostartdelay", "0" );
-    SpinBoxTime->setValue( m_autoStartTimer.toInt() );
+    m_autoStartTimer = cfg.readNumEntry( "autostartdelay", 0 );
+    SpinBoxTime->setValue( m_autoStartTimer );
 
     cfg.setGroup( "Plugins" );
     m_excludeApplets = cfg.readListEntry( "ExcludeApplets", ',' );
@@ -168,7 +167,10 @@ void TodayConfig::writeConfig() {
     m_autoStart = CheckBoxAuto->isChecked();
     cfg.writeEntry( "autostart",  m_autoStart );
     m_autoStartTimer = SpinBoxTime->value();
-    cfg.readEntry( "autostartdelay", m_autoStartTimer );
+    cfg.writeEntry( "autostartdelay", m_autoStartTimer );
+
+    // set autostart settings
+    setAutoStart();
 }
 
 
diff --git a/core/pim/today/todayconfig.h b/core/pim/today/todayconfig.h
index 7c261bd..f23b850 100644
--- a/core/pim/today/todayconfig.h
+++ b/core/pim/today/todayconfig.h
@@ -54,7 +54,7 @@ private:
     QMap<QString,QCheckListItem*> m_applets;
 
     int m_autoStart;
-    QString m_autoStartTimer;
+    int m_autoStartTimer;
     QStringList m_excludeApplets;
     bool m_applets_changed;