fixes

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
@@ -97,3 +97,2 @@ bool ListItemVisitor::visit(Event *e)
 {
-    
     bool ok = false;
@@ -128,2 +127,4 @@ bool ListItemVisitor::visit(Event *e)
     mItem->setText(6, e->recurrence()->recurrenceText());
+    if( ! e->doesRecur() )
+        mItem->setSortKey( 6, "-" );
     mItem->setText(7,"---");
@@ -141,3 +142,2 @@ bool ListItemVisitor::visit(Event *e)
     mItem->setSortKey(3,key);
-
     return true;
@@ -167,2 +167,4 @@ bool ListItemVisitor::visit(Todo *t)
     mItem->setText(6, t->recurrence()->recurrenceText());
+    if( ! t->doesRecur() )
+        mItem->setSortKey( 6, "-" );
     if (t->hasDueDate()) {
@@ -882,2 +884,3 @@ void KOListView::addEvents(QPtrList<Event> eventList)
 {
+ 
     Event *ev;
@@ -918,8 +921,8 @@ void KOListView::addIncidence(Incidence *incidence)
     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 ");
 }
diff --git a/korganizer/searchdialog.cpp b/korganizer/searchdialog.cpp
index de65b53..007d1f3 100644
--- a/korganizer/searchdialog.cpp
+++ b/korganizer/searchdialog.cpp
@@ -225,5 +225,3 @@ void SearchDialog::doSearch()
     }
-
     search(re);
-
     listView->setStartDate( mStartDate->date() );
@@ -232,3 +230,2 @@ void SearchDialog::doSearch()
     listView->addJournals(mMatchedJournals);
-
     if (mMatchedEvents.count() + mMatchedJournals.count() + mMatchedTodos.count() == 0) {
diff --git a/libkcal/alarm.cpp b/libkcal/alarm.cpp
index d8f15b5..6de1566 100644
--- a/libkcal/alarm.cpp
+++ b/libkcal/alarm.cpp
@@ -360,3 +360,3 @@ QString Alarm::offsetText()
     QString message;
-    qDebug("%d %d %d ", days, hours, min  );
+    //qDebug("%d %d %d ", days, hours, min  );
     if ( days > 0 )
diff --git a/libkcal/kincidenceformatter.cpp b/libkcal/kincidenceformatter.cpp
index 8ae5b46..7d61b7f 100644
--- a/libkcal/kincidenceformatter.cpp
+++ b/libkcal/kincidenceformatter.cpp
@@ -285,3 +285,3 @@ 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());