4 files changed, 10 insertions, 10 deletions

diff --git a/korganizer/kolistview.cpp b/korganizer/kolistview.cpp
index e1b393d..a1bf9ff 100644
--- a/korganizer/kolistview.cpp
+++ b/korganizer/kolistview.cpp
@@ -95,7 +95,6 @@ ListItemVisitor::~ListItemVisitor()
 
 bool ListItemVisitor::visit(Event *e)
 {
-    
     bool ok = false;
     QString start, end;
     QDate ds, de;
@@ -126,6 +125,8 @@ bool ListItemVisitor::visit(Event *e)
         mItem->setText(5, i18n("No"));
     }
     mItem->setText(6, e->recurrence()->recurrenceText());
+    if( ! e->doesRecur() )
+        mItem->setSortKey( 6, "-" );
     mItem->setText(7,"---");
     mItem->setText(8,"---");
     mItem->setText(9, e->cancelled() ? i18n("Yes") : i18n("No"));
@@ -139,7 +140,6 @@ bool ListItemVisitor::visit(Event *e)
     t = e->doesFloat() ? QTime(0,0) : e->dtEnd().time();
     key.sprintf("%04d%02d%02d%02d%02d",de.year(),de.month(),de.day(),t.hour(),t.minute());
     mItem->setSortKey(3,key);
-
     return true;
 }
 
@@ -165,6 +165,8 @@ bool ListItemVisitor::visit(Todo *t)
         mItem->setText(5, i18n("No"));
     }
     mItem->setText(6, t->recurrence()->recurrenceText());
+    if( ! t->doesRecur() )
+        mItem->setSortKey( 6, "-" );
     if (t->hasDueDate()) {
         mItem->setText(7,t->dtDueDateStr());
         if (t->doesFloat()) {
@@ -880,6 +882,7 @@ void KOListView::showDates(const QDate &start, const QDate &end)
 
 void KOListView::addEvents(QPtrList<Event> eventList)
 {
+ 
     Event *ev;
     for(ev = eventList.first(); ev; ev = eventList.next()) {
         addIncidence(ev);
@@ -916,12 +919,12 @@ void KOListView::addIncidence(Incidence *incidence)
   
     // mListView->setFont ( KOPrefs::instance()->mListViewFont );
     mUidDict.insert( incidence->uid(), incidence );
-
     KOListViewItem *item = new KOListViewItem( incidence, mListView ); 
     ListItemVisitor v(item, mStartDate );
-    if (incidence->accept(v)) return;
+    if (incidence->accept(v)) {
+        return;
+    }
     else delete item;
-    //qDebug("delete item ");
 }
 
 void KOListView::showEvents(QPtrList<Event> eventList)
diff --git a/korganizer/searchdialog.cpp b/korganizer/searchdialog.cpp
index de65b53..007d1f3 100644
--- a/korganizer/searchdialog.cpp
+++ b/korganizer/searchdialog.cpp
@@ -223,14 +223,11 @@ void SearchDialog::doSearch()
                                 "where needed."));
         return;
     }
-
     search(re);
-
     listView->setStartDate( mStartDate->date() );
     listView->showEvents(mMatchedEvents);
     listView->addTodos(mMatchedTodos);
     listView->addJournals(mMatchedJournals);
-
     if (mMatchedEvents.count() + mMatchedJournals.count() + mMatchedTodos.count() == 0) {
         setCaption(i18n("No items found. Use '*' and '?' where needed."));
     } else {
diff --git a/libkcal/alarm.cpp b/libkcal/alarm.cpp
index d8f15b5..6de1566 100644
--- a/libkcal/alarm.cpp
+++ b/libkcal/alarm.cpp
@@ -358,7 +358,7 @@ QString Alarm::offsetText()
     int days = hours /24;
     hours = hours % 24;
     QString message;
-    qDebug("%d %d %d ", days, hours, min  );
+    //qDebug("%d %d %d ", days, hours, min  );
     if ( days > 0 )
         message += i18n("%1d").arg( days );
     if ( hours > 0 ) {
diff --git a/libkcal/kincidenceformatter.cpp b/libkcal/kincidenceformatter.cpp
index 8ae5b46..7d61b7f 100644
--- a/libkcal/kincidenceformatter.cpp
+++ b/libkcal/kincidenceformatter.cpp
@@ -283,7 +283,7 @@ void KIncidenceFormatter::setJournal(Journal*  )
 void KIncidenceFormatter::formatCategories(Incidence *event)
 {
  if (!event->categoriesStr().isEmpty()) {
-     addTag("p",i18n("<b>Categories: </b>")+event->categoriesStr() );
+     addTag("p",i18n("<b>Categories: </b>")+event->categoriesStrWithSpace() );
      //mText.append(event->categoriesStr());
  }
 }