1 files changed, 5 insertions, 6 deletions

diff --git a/core/pim/today/today.cpp b/core/pim/today/today.cpp
index 0f6e598..7a2d0c9 100644
--- a/core/pim/today/today.cpp
+++ b/core/pim/today/today.cpp
@@ -169,91 +169,90 @@ void Today::getDates()
           it!=list.end(); ++it ) {
       
       count++;
       
       if ( count <= MAX_LINES_MEET ) 
         {
           //only get events past current time (start or end??)
           //cout << time.toString() << endl;
           //cout << TimeString::dateString((*it).event().end()) << endl;
           // still some bug in here, 1 h off 
 
           // decide if to get all day or only later appointments
           if (!ONLY_LATER)
             {
                msg += "<B>" + (*it).description() + "</B>";
                // include location or not
                if (SHOW_LOCATION == 1) 
                  {
                   msg+= "<BR>" + (*it).location();
                  }
                msg += "<BR>"
                  // start time of event
                  + TimeString::timeString(QTime((*it).event().start().time()) )
                  // end time of event
                  + "<b> - </b>" + TimeString::timeString(QTime((*it).event().end().time()) )
                  + "<BR>";
                // include possible note or not
                if (SHOW_NOTES == 1)
                 {
                   msg += " <i>note</i>:" +((*it).notes()).mid(0, MAX_CHAR_CLIP) + "<br>";
                 }
             }
-          else if ((time.toString() <= TimeString::dateString((*it).event().end())) && ONLY_LATER )
+          else if ((time.toString() <= TimeString::dateString((*it).event().end())) )
             {
               msg += "<B>" + (*it).description() + "</B>";
               // include location or not
               if (SHOW_LOCATION == 1) 
                 {
                   msg+= "<BR>" + (*it).location();
                 }
               msg += "<BR>"
                 // start time of event
                 + TimeString::timeString(QTime((*it).event().start().time()) )
                 // end time of event
                 + "<b> - </b>" + TimeString::timeString(QTime((*it).event().end().time()) )
                 + "<BR>";
               // include possible note or not
               if (SHOW_NOTES == 1)
                 {
                   msg += " <i>note</i>:" +((*it).notes()).mid(0, MAX_CHAR_CLIP) + "<br>";
                 }
             }
         }
-      
-      if (msg.isEmpty())
-        {
-          msg = "No more appointments today";
-        }
     }
+    if (msg.isEmpty())
+      {
+        msg = "No more appointments today";
+      }
     DatesField->setText(msg);
   }
 }
 
 /*
  * Parse in the todolist.xml
  * 
  */
 QList<TodoItem> Today::loadTodo(const char *filename)
 {
   DOM *todo;
   ELE *tasks;
   ELE **tasklist;
   ATT **attlist;
   int i, j;
   char *description;
   int completed;
   int priority;
   TodoItem *tmp;
   QList<TodoItem> loadtodolist;
   
   todo = minidom_load(filename);
   
   tasks = todo->el;
   tasks = tasks->el[0]; /*!DOCTYPE-quickhack*/
   if(tasks)
     {
       tasklist = tasks->el;
       i = 0;
       while((tasklist) && (tasklist[i]))
         {
           attlist = tasklist[i]->at;