1 files changed, 9 insertions, 2 deletions

diff --git a/core/pim/todo/todotable.cpp b/core/pim/todo/todotable.cpp
index 52a3087..779b28c 100644
--- a/core/pim/todo/todotable.cpp
+++ b/core/pim/todo/todotable.cpp
@@ -569,12 +569,13 @@ void TodoTable::updateJournal( const ToDoEvent &todo, journal_action action )
       attr.append(QString::number(arrat[i])+";" );
     }
     if(!attr.isEmpty() ) // remove the last ;
       attr.remove(attr.length()-1, 1 );
     buf += " Categories=\"" + attr + "\"";
     buf += " Description=\"" + todo.description() + "\"";
+    buf += " Summary=\"" + todo.summary() + "\"";
     if(todo.hasDate() ) {
       buf += " DateYear=\""+QString::number( todo.date().year() ) + "\"";
       buf += " DateMonth=\"" + QString::number( todo.date().month() ) + "\"";
       buf += " DateDay=\"" + QString::number( todo.date().day() ) + "\"";
     }
     buf += "/>\n";
@@ -607,14 +608,17 @@ void TodoTable::loadFile( const QString &/*we use the standard*/ )
   }
 //     qDebug("loading done: t=%d", t.elapsed() );
 }
 
 void TodoTable::journalFreeReplaceEntry( const ToDoEvent &todo, int row )
 {
-    QString strTodo;
-    strTodo = todo.description().left(40).simplifyWhiteSpace();
+    QString strTodo = todo.summary();
+    if( strTodo.isEmpty() ){
+        strTodo = todo.description().left(40).simplifyWhiteSpace();
+        //todo.setSummary(strTodo );
+    }
     if ( row == -1 ) {
         QMapIterator<CheckItem*, ToDoEvent *> it;
         for ( it = todoList.begin(); it != todoList.end(); ++it ) {
             if ( *(*it) == todo ) {
                 row = it.key()->row();
                 it.key()->setChecked( todo.isCompleted() );
@@ -905,12 +909,15 @@ static ToDoEvent xmlToEvent( XMLElement *element )
   dumInt = dummy.toInt(&ok );
   if(!ok ) dumInt = ToDoEvent::NORMAL;
   event.setPriority( dumInt );
   //description
   dummy = element->attribute("Description" );
   event.setDescription( dummy );
+  // summary
+  dummy = element->attribute("Summary" );
+  event.setSummary( dummy );
   // category
   dummy = element->attribute("Categories" );
   QStringList ids = QStringList::split(";", dummy );
   event.setCategories( ids );     
   
   //uid