https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim ........ r1045769 | tmcguire | 2009-11-06 13:42:01 -0500 (Fri, 06 Nov 2009) | 2 lines Factor out subfolder creation into a separate method, I need that for the import job. ........ svn path=/branches/kdepim/enterprise4/kdepim/; revision=1045874wilder-work
commit
93c1d7eb40
4 changed files with 154 additions and 47 deletions
@ -0,0 +1,81 @@ |
||||
/* Copyright 2009 Thomas McGuire <mcguire@kde.org>
|
||||
|
||||
This program is free software; you can redistribute it and/or |
||||
modify it under the terms of the GNU General Public License as |
||||
published by the Free Software Foundation; either version 2 of |
||||
the License or (at your option) version 3 or any later version |
||||
accepted by the membership of KDE e.V. (or its successor approved |
||||
by the membership of KDE e.V.), which shall act as a proxy |
||||
defined in Section 14 of version 3 of the license. |
||||
|
||||
This program is distributed in the hope that it will be useful, |
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of |
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
||||
GNU General Public License for more details. |
||||
|
||||
You should have received a copy of the GNU General Public License |
||||
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/ |
||||
#include "folderutil.h" |
||||
|
||||
#include "kmfolder.h" |
||||
#include "kmfolderimap.h" |
||||
#include "kmfoldercachedimap.h" |
||||
#include "kmfoldermgr.h" |
||||
|
||||
using namespace KMail; |
||||
using namespace FolderUtil; |
||||
|
||||
KMFolder *KMail::FolderUtil::createSubFolder( KMFolder *parentFolder, KMFolderDir *parentDir, |
||||
const QString &folderName, const QString &namespaceName, |
||||
KMFolderType localFolderType ) |
||||
{ |
||||
KMFolder *newFolder = 0; |
||||
|
||||
if ( parentFolder && parentFolder->folderType() == KMFolderTypeImap ) { |
||||
KMFolderImap* selectedStorage = static_cast<KMFolderImap*>( parentFolder->storage() ); |
||||
KMAcctImap *anAccount = selectedStorage->account(); |
||||
// check if a connection is available BEFORE creating the folder
|
||||
if (anAccount->makeConnection() == ImapAccountBase::Connected) { |
||||
newFolder = kmkernel->imapFolderMgr()->createFolder( folderName, false, KMFolderTypeImap, parentDir ); |
||||
if ( newFolder ) { |
||||
QString imapPath, parent; |
||||
if ( !namespaceName.isEmpty() ) { |
||||
// create folder with namespace
|
||||
parent = anAccount->addPathToNamespace( namespaceName ); |
||||
imapPath = anAccount->createImapPath( parent, folderName ); |
||||
} else { |
||||
imapPath = anAccount->createImapPath( selectedStorage->imapPath(), folderName ); |
||||
} |
||||
KMFolderImap* newStorage = static_cast<KMFolderImap*>( newFolder->storage() ); |
||||
selectedStorage->createFolder(folderName, parent); // create it on the server
|
||||
newStorage->initializeFrom( selectedStorage, imapPath, QString::null ); |
||||
static_cast<KMFolderImap*>(parentFolder->storage())->setAccount( selectedStorage->account() ); |
||||
return newFolder; |
||||
} |
||||
} |
||||
} else if ( parentFolder && parentFolder->folderType() == KMFolderTypeCachedImap ) { |
||||
newFolder = kmkernel->dimapFolderMgr()->createFolder( folderName, false, KMFolderTypeCachedImap, |
||||
parentDir ); |
||||
if ( newFolder ) { |
||||
KMFolderCachedImap* selectedStorage = static_cast<KMFolderCachedImap*>( parentFolder->storage() ); |
||||
KMFolderCachedImap* newStorage = static_cast<KMFolderCachedImap*>( newFolder->storage() ); |
||||
newStorage->initializeFrom( selectedStorage ); |
||||
if ( !namespaceName.isEmpty() ) { |
||||
// create folder with namespace
|
||||
QString path = selectedStorage->account()->createImapPath( |
||||
namespaceName, folderName ); |
||||
newStorage->setImapPathForCreation( path ); |
||||
} |
||||
return newFolder; |
||||
} |
||||
} else { |
||||
// local folder
|
||||
Q_ASSERT( localFolderType == KMFolderTypeMaildir || localFolderType == KMFolderTypeMbox ); |
||||
newFolder = kmkernel->folderMgr()->createFolder( folderName, false, KMFolderTypeMaildir, |
||||
parentDir ); |
||||
return newFolder; |
||||
} |
||||
|
||||
return newFolder; |
||||
} |
||||
@ -0,0 +1,54 @@ |
||||
/* Copyright 2009 Thomas McGuire <mcguire@kde.org>
|
||||
|
||||
This program is free software; you can redistribute it and/or |
||||
modify it under the terms of the GNU General Public License as |
||||
published by the Free Software Foundation; either version 2 of |
||||
the License or (at your option) version 3 or any later version |
||||
accepted by the membership of KDE e.V. (or its successor approved |
||||
by the membership of KDE e.V.), which shall act as a proxy |
||||
defined in Section 14 of version 3 of the license. |
||||
|
||||
This program is distributed in the hope that it will be useful, |
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of |
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
||||
GNU General Public License for more details. |
||||
|
||||
You should have received a copy of the GNU General Public License |
||||
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/ |
||||
#ifndef FOLDERUTIL_H |
||||
#define FOLDERUTIL_H |
||||
|
||||
#include "kmfoldertype.h" |
||||
|
||||
class KMFolder; |
||||
class KMFolderDir; |
||||
class QString; |
||||
|
||||
namespace KMail |
||||
{ |
||||
|
||||
namespace FolderUtil |
||||
{ |
||||
|
||||
/**
|
||||
* Low-level function to create a subfolder for a folder of any kind. |
||||
* |
||||
* @param parentFolder parent folder of the folder that should be created. Can be 0 in case of |
||||
* local folders |
||||
* @param parentDir parent folder directory, which should be the folder directory of parentFolder |
||||
* @param folderName the name the newly created folder should have |
||||
* @param namespaceName for (d)IMAP folders, the namespace the new folder should be in. Can be empty. |
||||
* @param localFolderType for local folders, this determines if the folder should be MBOX or maildir |
||||
* |
||||
* @return the newly created folder or 0 in case an error occured |
||||
*/ |
||||
KMFolder *createSubFolder( KMFolder *parentFolder, KMFolderDir *parentDir, |
||||
const QString &folderName, const QString &namespaceName, |
||||
KMFolderType localFolderType ); |
||||
|
||||
} |
||||
|
||||
} |
||||
|
||||
#endif |
||||
Loading…
Reference in new issue