From 4525efaf9c8e17df49521e4ecda40701e7e2bcbb Mon Sep 17 00:00:00 2001 From: David Faure Date: Sun, 23 Jan 2005 22:04:09 +0000 Subject: [PATCH] sync with HEAD (remove a TODO) svn path=/branches/proko2/kdepim/; revision=381759 --- folderdiaacltab.cpp | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/folderdiaacltab.cpp b/folderdiaacltab.cpp index 265ebdbff..e47b41f38 100644 --- a/folderdiaacltab.cpp +++ b/folderdiaacltab.cpp @@ -403,18 +403,13 @@ void KMail::FolderDiaACLTab::load() KMFolderCachedImap* folderImap = static_cast( 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; }