[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdepim/kontact/plugins/knotes
From:       Michael Brade <brade () kde ! org>
Date:       2006-05-10 10:37:35
Message-ID: 1147257455.214137.20217.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 539312 by brade:

Forward port of rev 539305:

Fix the implementation of killNote(), it did nothing when force == true.
Fixes #127063.

This also fixes the embarrasingly wrong implementation of KNotesPart::notes(),
it returned the body of the notes, not the title.



 M  +12 -8     knotes_part.cpp  


--- trunk/KDE/kdepim/kontact/plugins/knotes/knotes_part.cpp #539311:539312
@@ -172,13 +172,17 @@
 {
   KNotesIconViewItem *note = mNoteList[ id ];
 
-   if ( note && !force && KMessageBox::warningContinueCancelList( mNotesView,
-        i18n( "Do you really want to delete this note?" ),
-        QStringList( mNoteList[ id ]->text() ), i18n( "Confirm Delete" ),
-        KStdGuiItem::del() ) == KMessageBox::Continue ) {
-     mManager->deleteNote( mNoteList[id]->journal() );
-     mManager->save();
-   }
+  if ( note &&
+       ( (!force && KMessageBox::warningContinueCancelList( mNotesView,
+                    i18n( "Do you really want to delete this note?" ),
+                    mNoteList[ id ]->text(), i18n( "Confirm Delete" ),
+                    KStdGuiItem::del() ) == KMessageBox::Continue)
+         || force )
+     )
+  {
+    mManager->deleteNote( mNoteList[id]->journal() );
+    mManager->save();
+  }
 }
 
 QString KNotesPart::name( const QString& id ) const
@@ -223,7 +227,7 @@
   Q3DictIterator<KNotesIconViewItem> it( mNoteList );
 
   for ( ; it.current(); ++it )
-    notes.insert( (*it)->journal()->uid(), (*it)->journal()->description() );
+    notes.insert( (*it)->journal()->uid(), (*it)->journal()->summary() );
 
   return notes;
 }
[prev in list] [next in list] [prev in thread] [next in thread]