should fix bug #83

1 files changed, 23 insertions, 17 deletions

diff --git a/core/pim/today/today.cpp b/core/pim/today/today.cpp
index ad1ec90..62becb0 100644
--- a/core/pim/today/today.cpp
+++ b/core/pim/today/today.cpp
@@ -23,5 +23,4 @@
 #include <qpe/config.h>
 #include <qpe/qcopenvelope_qws.h>
-//#include <qpe/qprocess.h>
 #include <qpe/resource.h>
 #include <qpe/contact.h>
@@ -39,10 +38,8 @@
 #include <qtimer.h>
 #include <qpixmap.h>
-//#include <qfileinfo.h>
 #include <qlayout.h>
 #include <qtl.h>
 
 
-//#include <iostream.h>
 #include <unistd.h>
 #include <stdlib.h>
@@ -385,8 +382,13 @@ void Today::getTodo() {
   for ( QValueList<ToDoEvent>::Iterator it=overDueList.begin();
 	it!=overDueList.end(); ++it ) {
-    if (!(*it).isCompleted() && ( ammount < MAX_LINES_TASK) ) {
-      tmpout += "<font color=#e00000><b>-" +((*it).description()).mid(0, MAX_CHAR_CLIP) + "</b></font><br>";
-      ammount++;
-    }
+      if (!(*it).isCompleted() && ( ammount < MAX_LINES_TASK) ) {
+          QString desc = (*it).summary();
+          if( desc.isEmpty() ) {
+              desc = (*it).description();
+          }
+          tmpout += "<font color=#e00000><b>-" + desc.mid(0, MAX_CHAR_CLIP) + "</b></font><br>";
+
+          ammount++;
+      }
   }
 
@@ -396,13 +398,17 @@ void Today::getTodo() {
   for ( QValueList<ToDoEvent>::Iterator it=openTodo.begin();
 	it!=openTodo.end(); ++it ) {
-    if (!(*it).isCompleted()){
-      count +=1;
-      // not the overdues, we allready got them, and not if we are
-      // over the maxlines
-      if (!(*it).isOverdue() && ( ammount < MAX_LINES_TASK) ) {
-	tmpout += "<b>-</b>" + ((*it).description()).mid(0, MAX_CHAR_CLIP) + "<br>";
-	ammount++;
+      if (!(*it).isCompleted()){
+          count +=1;
+          // not the overdues, we allready got them, and not if we are
+          // over the maxlines
+          if (!(*it).isOverdue() && ( ammount < MAX_LINES_TASK) ) {
+              QString desc = (*it).summary();
+              if( desc.isEmpty() ) {
+                  desc = (*it).description();
+              }
+              tmpout += "<b>-</b>" + desc.mid(0, MAX_CHAR_CLIP) + "<br>";
+              ammount++;
+          }
       }
-    }
   }
 
@@ -445,6 +451,6 @@ void Today::editCard() {
  */
 void Today::startDatebook() {
-  QCopEnvelope e("QPE/System", "execute(QString)");
-  e << QString("datebook");
+    QCopEnvelope e("QPE/System", "execute(QString)");
+    e << QString("datebook");
 }