serveral bugfixes regarding todo section

3 files changed, 11 insertions, 7 deletions

diff --git a/core/pim/today/changelog b/core/pim/today/changelog
index c687cea..93bbcac 100644
--- a/core/pim/today/changelog
+++ b/core/pim/today/changelog
@@ -1,6 +1,10 @@
+0.3.4
+
+* Several bugfixes regarding todo section.
+
 0.3.3
 
 * Changed the logo so it better scales to bigger display and also
   made the "Today" string translatable.
 * some am/pm fixes
 * clickable labels now in libopie
diff --git a/core/pim/today/opie-today.control b/core/pim/today/opie-today.control
index da9d9fa..46c0d71 100644
--- a/core/pim/today/opie-today.control
+++ b/core/pim/today/opie-today.control
@@ -1,12 +1,12 @@
 Files: bin/today apps/Applications/today.desktop pics/today/*
 Priority: optional
 Section: opie/applications
 Maintainer: Maximilian Reiß <max.reiss@gmx.de>
 Architecture: arm
-Version: 0.3.3-$SUB_VERSION
+Version: 0.3.4-$SUB_VERSION
 Depends: opie-base ($QPE_VERSION), libopie ($QPE_VERSION)
 License: GPL
 Description: today screen
  This today screen app gives an overview of appointments 
  and todos.
  It also shows incoming and outgoing mails from opiemail.
diff --git a/core/pim/today/today.cpp b/core/pim/today/today.cpp
index 0f4cbdb..4368201 100644
--- a/core/pim/today/today.cpp
+++ b/core/pim/today/today.cpp
@@ -79,14 +79,14 @@ Today::Today( QWidget* parent,  const char* name, WFlags fl )
 
 
 
   db = NULL;
   setOwnerField();
   todo = new ToDoDB;
-  getTodo();
   draw();
+  getTodo();
   autoStart();
 }
 
 /*
  * Qcop receive method.
  */
@@ -151,13 +151,13 @@ void Today::autoStart() {
 void Today::draw() {
   init();
   getDates();
   getMail();
 
   // if the todolist.xml file was not modified in between, do not parse it.
-  if (checkIfModified()) {
+  if (checkIfModified() || NEW_START==1) {
     if (todo) delete todo;
     todo = new ToDoDB;
     getTodo();
   }
 
   // how often refresh
@@ -386,16 +386,16 @@ void Today::getTodo() {
       tmpout += "<font color=#e00000><b>-" +((*it).description()).mid(0, MAX_CHAR_CLIP) + "</b></font><br>";
       ammount++;
     }
   }
 
   // get total number of still open todos
-  QValueList<ToDoEvent> open = todo->rawToDos();
-  qBubbleSort(open);
-  for ( QValueList<ToDoEvent>::Iterator it=open.begin();
-        it!=open.end(); ++it ) {
+  QValueList<ToDoEvent> openTodo = todo->rawToDos();
+  qBubbleSort(openTodo);
+  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>";