* Massive set of changes to bring in all fixes and enhancements from the Enterprise PIM branch

* Ensured that the Trinity changes were applied on top of those enhancements, and any redundancy removed
* Added journal read support to the CalDAV resource
* Fixed CalDAV resource to use events URL for tasks and journals when separate URL checkbox unchecked


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1170461 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 13 insertions, 3 deletions

diff --git a/kmail/simplestringlisteditor.cpp b/kmail/simplestringlisteditor.cpp
index 8d71e221..4be67e6e 100644
--- a/kmail/simplestringlisteditor.cpp
+++ b/kmail/simplestringlisteditor.cpp
@@ -166,6 +166,15 @@ TQStringList SimpleStringListEditor::stringList() const {
   return result;
 }
 
+bool SimpleStringListEditor::containsString( const TQString & str ) {
+  for ( TQListBoxItem * item = mListBox->firstItem() ;
+	item ; item = item->next() ) {
+    if ( item->text() == str )
+      return true;
+  }
+  return false;
+}
+
 void SimpleStringListEditor::setButtonText( ButtonCode button,
 					    const TQString & text ) {
   switch ( button ) {
@@ -207,9 +216,10 @@ void SimpleStringListEditor::slotAdd() {
 					    &ok, this );
   // let the user verify the string before adding
   emit aboutToAdd( newEntry );
-  if ( ok && !newEntry.isEmpty() )
-    mListBox->insertItem( newEntry );
-  emit changed();
+  if ( ok && !newEntry.isEmpty() && !containsString( newEntry )) {
+      mListBox->insertItem( newEntry );
+      emit changed();
+  }
 }
 
 void SimpleStringListEditor::slotRemove() {