1 files changed, 8 insertions, 7 deletions

diff --git a/core/pim/today/plugins/datebook/datebookpluginwidget.cpp b/core/pim/today/plugins/datebook/datebookpluginwidget.cpp
index e2f492e..9a18408 100644
--- a/core/pim/today/plugins/datebook/datebookpluginwidget.cpp
+++ b/core/pim/today/plugins/datebook/datebookpluginwidget.cpp
@@ -25,91 +25,92 @@
 #include <qlayout.h>
 #include <qtl.h>
 #include <qscrollview.h>
 #include <qtimer.h>
 
 DatebookPluginWidget::DatebookPluginWidget( QWidget *parent,  const char* name)
     : QWidget(parent,  name ) {
 
     db = 0l;
     m_layoutDates = 0l;
 
     if ( db ) {
         delete db;
     }
     db = new DateBookDB;
 
+
     if ( m_layoutDates )  {
         delete m_layoutDates;
     }
     m_layoutDates = new QVBoxLayout( this );
     m_layoutDates->setAutoAdd( true );
 
+    m_eventsList.setAutoDelete( true );
+
     readConfig();
     getDates();
 }
 
 DatebookPluginWidget::~DatebookPluginWidget() {
     delete db;
     delete m_layoutDates;
 }
 
 
 void DatebookPluginWidget::readConfig() {
     Config cfg( "todaydatebookplugin" );
     cfg.setGroup( "config" );
     m_max_lines_meet = cfg.readNumEntry( "maxlinesmeet", 5 );
     m_show_location = cfg.readNumEntry( "showlocation", 1 );
     m_show_notes = cfg.readNumEntry( "shownotes", 0 );
     m_onlyLater = cfg.readNumEntry( "onlylater", 1 );
     m_moreDays = cfg.readNumEntry( "moredays", 0 );
 }
 
 void DatebookPluginWidget::refresh()  {
     DateBookEvent* ev;
     for ( ev = m_eventsList.first(); ev != 0; ev = m_eventsList.next() )  {
         delete ev;
     }
+    m_eventsList.clear();
     getDates();
 }
 
 /**
  *  Get all events that are in the datebook xml file for today
  */
 void DatebookPluginWidget::getDates() {
 
     QDate date = QDate::currentDate();
-
     QValueList<EffectiveEvent> list = db->getEffectiveEvents( date, date.addDays( m_moreDays )  );
     qBubbleSort( list );
-    //Config config( "qpe" );
-    int count=0;
+    int count = 0;
 
+    qDebug( QString("List count %1" ).arg(list.count() ) );
     if ( list.count() > 0 ) {
 
-        for ( QValueList<EffectiveEvent>::ConstIterator it = list.begin(); it != list.end(); ++it ) {
+        for ( QValueList<EffectiveEvent>::ConstIterator it = list.begin(); it  != list.end(); ++it ) {
 
             if ( count <= m_max_lines_meet ) {
-                QTime time = QTime::currentTime();
-
                 if ( !m_onlyLater ) {
                     count++;
                     DateBookEvent *l = new DateBookEvent( *it, this, m_show_location, m_show_notes );
                     m_eventsList.append( l );
                     QObject::connect ( l, SIGNAL( editEvent( const Event & ) ), l, SLOT( editEventSlot( const Event & ) ) );
-                } else if ( ( time.toString() <= TimeString::dateString( (*it).event().end() ) ) ) {
+                } else if ( QDateTime::currentDateTime()  <= (*it).event().end() ) {
                     count++;
                     // show only later appointments
                     DateBookEvent *l = new DateBookEvent( *it, this, m_show_location, m_show_notes );
                     m_eventsList.append( l );
                     QObject::connect ( l, SIGNAL( editEvent( const Event & ) ), l, SLOT( editEventSlot( const Event & ) ) );
                 }
             }
         }
         if ( m_onlyLater && count == 0 ) {
             QLabel* noMoreEvents = new QLabel( this );
             noMoreEvents->setText( QObject::tr( "No more appointments today" ) );
         }
     } else {
         QLabel* noEvents = new QLabel( this );
         noEvents->setText( QObject::tr( "No appointments today" ) );
     }