sync with HEAD (remove a TODO)

svn path=/branches/proko2/kdepim/; revision=381759

folderdiaacltab.cpp

@@ -403,18 +403,13 @@ void KMail::FolderDiaACLTab::load()
     KMFolderCachedImap* folderImap = static_cast<KMFolderCachedImap*>( folder->storage() );
     if ( mUserRights == -1 ) { // error
       mLabel->setText( i18n( "Error retrieving user permissions." ) );
-    } else if ( mUserRights == 0 ) { // not listed yet
-      mLabel->setText( i18n( "Information not retrieved from server yet, please use \"Check Mail\"." ) );
-      // TODO: save mUserRights and mACLList into a config file so that this almost never happens
-    } else {
-      /* We either synced, or we read user rights from the config, so we can 
+    } else if ( mUserRights == 0 /* can't happen anymore */ || folderImap->aclList().isEmpty() ) {
+      /* We either synced, or we read user rights from the config, so we can
          assume the server supports acls and an empty list means we haven't
          synced yet. */
-      if ( folderImap->aclList().isEmpty() ) {
         mLabel->setText( i18n( "Information not retrieved from server yet, please use \"Check Mail\"." ) );
-      } else {
-        loadFinished( folderImap->aclList() );
-      }
+    } else {
+      loadFinished( folderImap->aclList() );
     }
     return;
   }