From 9534eeabae9dc55ca1f21f38c53e3ad77e9937c7 Mon Sep 17 00:00:00 2001
From: David Faure <faure@kde.org>
Date: Tue, 21 Sep 2004 11:49:09 +0000
Subject: [PATCH] Ah, HEAD had this method already, just with another name.
 Renamed, to keep in sync.

svn path=/branches/proko2/kdepim/; revision=348148
---
 kmailicalifaceimpl.cpp | 11 +++++------
 kmailicalifaceimpl.h   |  2 +-
 kmfoldercachedimap.cpp |  2 +-
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/kmailicalifaceimpl.cpp b/kmailicalifaceimpl.cpp
index fcf3efe99..73c997ca4 100644
--- a/kmailicalifaceimpl.cpp
+++ b/kmailicalifaceimpl.cpp
@@ -1043,15 +1043,14 @@ KMFolder* KMailICalIfaceImpl::folderFromType( const QString& type,
 // this always returns false
 bool KMailICalIfaceImpl::isResourceImapFolder( KMFolder* folder ) const
 {
-  return isDefaultResourceFolder( folder ) ||
-    ( mUseResourceIMAP && folder && mExtraFolders.find( folder->location() )!=0 );
+  return mUseResourceIMAP && folder &&
+    ( isStandardResourceFolder( folder ) || mExtraFolders.find( folder->location() )!=0 );
 }
 
-bool KMailICalIfaceImpl::isDefaultResourceFolder( KMFolder* folder ) const
+bool KMailICalIfaceImpl::isStandardResourceFolder( KMFolder* folder ) const
 {
-  return mUseResourceIMAP && folder &&
-    ( folder == mCalendar || folder == mTasks || folder == mJournals ||
-      folder == mNotes || folder == mContacts );
+  return ( folder == mCalendar || folder == mTasks || folder == mJournals ||
+           folder == mNotes || folder == mContacts );
 }
 
 bool KMailICalIfaceImpl::hideResourceImapFolder( KMFolder* folder ) const
diff --git a/kmailicalifaceimpl.h b/kmailicalifaceimpl.h
index 9c63a71bd..49cce134a 100644
--- a/kmailicalifaceimpl.h
+++ b/kmailicalifaceimpl.h
@@ -118,7 +118,7 @@ public:
    * Returns true if resource mode is enabled and folder is one of the
    * default four resource folders.
    */
-  bool isDefaultResourceFolder( KMFolder* folder ) const;
+  bool isStandardResourceFolder( KMFolder* folder ) const;
 
   /**
    * Returns true if isResourceImapFolder( folder ) returns true, and
diff --git a/kmfoldercachedimap.cpp b/kmfoldercachedimap.cpp
index 86619e504..e22e62144 100644
--- a/kmfoldercachedimap.cpp
+++ b/kmfoldercachedimap.cpp
@@ -1735,7 +1735,7 @@ void KMFolderCachedImap::setContentsType( KMail::FolderContentsType type )
   if ( kmkernel->iCalIface().storageFormat( folder() ) == KMailICalIfaceImpl::StorageXML ) {
     mAnnotationFolderType = s_contentsType2Annotation[mContentsType];
     // The subtype is needed for outlook compatibility (https://intevation.de/roundup/kolab/issue406)
-    if ( kmkernel->iCalIface().isDefaultResourceFolder( folder() ) )
+    if ( kmkernel->iCalIface().isStandardResourceFolder( folder() ) )
       mAnnotationFolderType += ".default";
   }
   else