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

List:       kde-commits
Subject:    branches/KDE/3.5/kdepim/korn
From:       Mart Kelder <mart () kelder31 ! nl>
Date:       2006-06-21 8:54:57
Message-ID: 1150880097.993170.32721.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 553500 by mkelder:

- Changed email address.
- Corrected the making of a list of messages which have to be deleted for a given account.
  This will fix multiple messages removal from one server.

BUG: 128361


 M  +1 -1      main.cpp  
 M  +10 -2     subjectsdlg.cpp  


--- branches/KDE/3.5/kdepim/korn/main.cpp #553499:553500
@@ -25,7 +25,7 @@
 	aboutData.addAuthor("Rik Hemsley",0, "rik@kde.org");
 	aboutData.addAuthor("Fixes by Jörg Habenicht",0, "j.habenicht@europemail.com");
 	aboutData.addAuthor("Preview by Heiner Eichmann",0, "h.eichmann@gmx.de");
-	aboutData.addAuthor("Mart Kelder",0,"mart.kde@hccnet.nl");
+	aboutData.addAuthor("Mart Kelder",0,"mart@kelder31.nl");
 	
 	KCmdLineArgs::init( argc, argv, &aboutData );
 	KUniqueApplication::addCmdLineOptions();
--- branches/KDE/3.5/kdepim/korn/subjectsdlg.cpp #553499:553500
@@ -467,12 +467,20 @@
 {
 	_delete->ids->clear();
 	KornMailSubject *current;
-	for( current = _delete->messages->first(); current; current = _delete->messages->next() )
+	
+	for( current = _delete->messages->first(); current; )
+	{
 		if( current->getMailDrop() == drop )
 		{
 			_delete->ids->append( current->getId() );
-			_delete->messages->remove( current );
+			if( _delete->messages->remove( current ) ) 
+				current = _delete->messages->current(); //If successfull, current() is already the next message
+			else
+				current = _delete->messages->next(); // If removal failed, goto the next item 
+		} else {
+			current = _delete->messages->next();  //Goto next item
 		}
+	}
 }
 
 void KornSubjectsDlg::deleteNextMessage()
[prev in list] [next in list] [prev in thread] [next in thread]