And finally the kmail extensions to the kolab resource.

svn path=/trunk/KDE/kdepim/; revision=684460

kmailicalifaceimpl.cpp

@@ -1259,7 +1259,6 @@ void KMailICalIfaceImpl::folderContentsTypeChanged( KMFolder* folder,
   ExtraFolder* ef = mExtraFolders.find( location );
   if ( ef && ef->folder ) {
     // Notify that the old folder resource is no longer available
-//    subresourceDeleted(folderContentsType( folder->storage()->contentsType() ), location );
     QDBusMessage message =
         QDBusMessage::createSignal("/GroupWare", DBUS_KMAIL, "subresourceDeleted");
     message << folderContentsType( folder->storage()->contentsType() );
@@ -1505,9 +1504,6 @@ void KMailICalIfaceImpl::slotFolderLocationChanged( const QString &oldLocation,
     QDBusConnection::sessionBus().send(message);
   }
 
-//  if (  folder )
-//    subresourceDeleted( folderContentsType(  folder->storage()->contentsType() ), oldLocation );
-
 }
 
 KMFolder* KMailICalIfaceImpl::findResourceFolder( const QString& resource )
@@ -2029,4 +2025,71 @@ bool KMailICalIfaceImpl::isResourceQuiet() const
   return mResourceQuiet;
 }
 
+
+bool KMailICalIfaceImpl::addSubresource( const QString& resource,
+                                         const QString& parent,
+                                         const QString& contentsType )
+{
+  kDebug(5006) << "Adding subresource to parent: " << parent << " with name: " << resource << endl;
+  kDebug(5006) << "contents type: " << contentsType << endl;
+  KMFolder *folder = findResourceFolder( parent );
+  KMFolderDir *parentFolderDir = !parent.isEmpty() && folder ? folder->createChildFolder(): mFolderParentDir;
+  if ( !parentFolderDir || parentFolderDir->hasNamedFolder( resource ) ) return false;
+
+  KMFolderType type = mFolderType;
+  if( type == KMFolderTypeUnknown ) type = KMFolderTypeMaildir;
+
+  KMFolder* newFolder = parentFolderDir->createFolder( resource, false, type );
+  if ( !newFolder ) return false;
+  if( mFolderType == KMFolderTypeImap )
+    static_cast<KMFolderImap*>( folder->storage() )->createFolder( resource );
+
+  StorageFormat defaultFormat = GlobalSettings::self()->theIMAPResourceStorageFormat() == GlobalSettings::EnumTheIMAPResourceStorageFormat::XML ? StorageXML : StorageIcalVcard;
+  setStorageFormat( newFolder, folder ? storageFormat( folder ) : defaultFormat );
+  newFolder->storage()->setContentsType( folderContentsType( contentsType ) );
+  newFolder->storage()->writeConfig();
+  newFolder->open( "KMailICalIfaceImpl::addSubresource" );
+  connectFolder( newFolder );
+  reloadFolderTree();
+
+  return true;
+}
+
+bool KMailICalIfaceImpl::removeSubresource( const QString& location )
+{
+  kDebug(5006) << k_funcinfo << endl;
+
+  KMFolder *folder = findResourceFolder( location );
+
+  // We don't allow the default folders to be deleted, so check for 
+  // those first. It would be nicer to produce a more meaningful error,
+  // or prevent deletion of the builtin folders from the gui already.
+  if ( !folder || isStandardResourceFolder( folder ) )
+      return false;
+
+  // the folder will be removed, which implies closed, so make sure 
+  // nothing is using it anymore first
+
+  QDBusMessage message =
+      QDBusMessage::createSignal("/GroupWare", DBUS_KMAIL, "subresourceDeleted");
+  message << folderContentsType( folder->storage()->contentsType() );
+  message << location;
+  QDBusConnection::sessionBus().send(message);
+
+  mExtraFolders.remove( location );
+  folder->disconnect( this );
+
+  if ( folder->folderType() == KMFolderTypeImap )
+    kmkernel->imapFolderMgr()->remove( folder );
+  else if ( folder->folderType() == KMFolderTypeCachedImap ) {
+    // Deleted by user -> tell the account (see KMFolderCachedImap::listDirectory2)
+    KMFolderCachedImap* storage = static_cast<KMFolderCachedImap*>( folder->storage() );
+    KMAcctCachedImap* acct = storage->account();
+    if ( acct )
+      acct->addDeletedFolder( folder );
+    kmkernel->dimapFolderMgr()->remove( folder );
+  }
+  return true;
+}
+
 #include "kmailicalifaceimpl.moc"

kmailicalifaceimpl.h

@@ -125,6 +125,11 @@ public:
                       quint32 sernum,
                       const QString& filename );
 
+  bool removeSubresource( const QString& );
+
+  bool addSubresource( const QString& resource,
+                       const QString& parent,
+                       const QString& contentsType );
 
   // tell KOrganizer about messages to be deleted
   void msgRemoved( KMFolder*, KMMessage* );