1 files changed, 8 insertions, 3 deletions

diff --git a/korganizer/kolistview.cpp b/korganizer/kolistview.cpp
index d4d9c0f..d0dbb47 100644
--- a/korganizer/kolistview.cpp
+++ b/korganizer/kolistview.cpp
@@ -311,141 +311,146 @@ KOListView::KOListView(Calendar *calendar, QWidget *parent,
                      this,SLOT(popupMenu(QListViewItem *,const QPoint &,int)));
     QObject::connect(mListView,SIGNAL(currentChanged(QListViewItem *)),
                      SLOT(processSelectionChange(QListViewItem *)));
     QObject::connect(mListView,SIGNAL(showIncidence(Incidence *)),
                      SIGNAL(showIncidenceSignal(Incidence *)) );
 
     readSettings(KOGlobals::config(),"KOListView Layout");
 }
 
 KOListView::~KOListView()
 {
     delete mPopupMenu;
 }
 QString KOListView::getWhatsThisText(QPoint p)
 {
     KOListViewItem* item = ( KOListViewItem* ) mListView->itemAt( p );
     if ( item )
         return KIncidenceFormatter::instance()->getFormattedText( item->data()  );
     return i18n("That is the list view" );
 
 }
 
 void KOListView::updateList()
 {
     // qDebug(" KOListView::updateList() ");
 
 }
 
 void KOListView::addCat( )
 {
     setCategories( false );
 }
 void KOListView::setCat()
 {
     setCategories( true );
 }
 void  KOListView::setAlarm()
 {
     KOAlarmPrefs kap( this);
     if ( !kap.exec() )
         return;
 
 
     QStringList itemList;
     QPtrList<KOListViewItem> sel ;
     QListViewItem *qitem  = mListView->firstChild ();
     while ( qitem ) {
         if ( qitem->isSelected() ) {
-            sel.append(((KOListViewItem *)qitem));
+            Incidence* inc = ((KOListViewItem *) qitem)->data();
+            if ( inc->type() != "Journal" ) {
+                if ( inc->type() == "Todo" ) {
+                    if ( ((Todo*)inc)->hasDueDate() )
+                      sel.append(((KOListViewItem *)qitem));
+                } else
+                      sel.append(((KOListViewItem *)qitem));
+            }
         }
         qitem = qitem->nextSibling();
     }
     int count = 0;
     KOListViewItem * item, *temp;
     item = sel.first();
     Incidence* inc;
     while ( item ) {
         inc = item->data();
-        if ( inc->type() != "Journal" ) {
             ++count;
             if (kap.mAlarmButton->isChecked()) {
                 if (inc->alarms().count() == 0) 
                     inc->newAlarm();
                 QPtrList<Alarm> alarms = inc->alarms();
                 Alarm *alarm;
                 for (alarm = alarms.first(); alarm; alarm = alarms.next() ) {
                     alarm->setEnabled(true);
                     int j = kap.mAlarmTimeEdit->value()* -60;
                     if (kap.mAlarmIncrCombo->currentItem() == 1)
                         j = j * 60;
                     else if (kap.mAlarmIncrCombo->currentItem() == 2)
                         j = j * (60 * 24);
                     alarm->setStartOffset( j );
 
                     if (!kap.mAlarmProgram.isEmpty() && kap.mAlarmProgramButton->isOn()) {
                         alarm->setProcedureAlarm(kap.mAlarmProgram);
                     }
                     else if (!kap.mAlarmSound.isEmpty() && kap.mAlarmSoundButton->isOn())
                         alarm->setAudioAlarm(kap.mAlarmSound);
                     else
                         alarm->setType(Alarm::Invalid);
                     //alarm->setAudioAlarm("default");
                     // TODO: Deal with multiple alarms
                     break; // For now, stop after the first alarm
                 }
             } else {
                 Alarm* alarm = inc->alarms().first();
                 if ( alarm ) {
                     alarm->setEnabled(false);
                     alarm->setType(Alarm::Invalid);
                 }
             }
-        }
         temp = item;
         item = sel.next();
         mUidDict.remove( inc->uid() ); 
         delete temp;;
         addIncidence( inc );
     }
     topLevelWidget()->setCaption( i18n("Canged alarm for %1 items").arg( count )  );
     qDebug("KO: Set alarm for %d items", count);
     calendar()->reInitAlarmSettings();
 }
 void KOListView::setCategories( bool removeOld )
 {
    
     KPIM::CategorySelectDialog* csd = new KPIM::CategorySelectDialog( KOPrefs::instance(), 0 );
     if (! csd->exec()) { 
         delete csd;
         return;
     }
     QStringList catList = csd->selectedCategories();
     delete csd;
     // if ( catList.count() == 0 )
     //   return;
     catList.sort();
     QString categoriesStr = catList.join(",");
     int i;
     QStringList itemList;
     QPtrList<KOListViewItem> sel ;
     QListViewItem *qitem  = mListView->firstChild ();
     while ( qitem ) {
         if ( qitem->isSelected() ) {
             sel.append(((KOListViewItem *)qitem));
         }
         qitem = qitem->nextSibling();
     }
     KOListViewItem * item, *temp;
     item = sel.first();
     Incidence* inc;
     while ( item ) {
         inc = item->data();
         if ( removeOld ) {
             inc->setCategories( categoriesStr );
         } else {
             itemList = QStringList::split (",", inc->categoriesStr() );
             for( i = 0; i<   catList.count(); ++i ) {
                 if (  !itemList.contains (catList[i]))
                     itemList.append( catList[i] );
             }
             itemList.sort();